fixed build after updating code from upstream
Fixing compilability under VS 2012
Merge mainline changes

Conflicts:
	src/lib/platform/CMSWindowsScreen.cpp
	src/lib/synergy/CClientApp.cpp
	tools/CMakeLists.txt