Merged most of the changes from trunk.

Because of really huge amount of modifications here I've probably missed some minor stuff. I doubt if it's still compatible with gcc - some changes should be reapplied.

CConsoleHandler.h

@@ -8,6 +8,12 @@ public:
 	void runConsole();
 
 	friend class CClient;
+
+#ifndef __GNUC__
+	friend int _tmain(int argc, _TCHAR* argv[]);
+#else
+	friend int main(int argc, _TCHAR* argv[]);
+#endif
 };
 
-#endif //CCONSOLEHANDLER_H
+#endif //CCONSOLEHANDLER_H