Incremented version to 1.2.5
Fixed versioning issue with ConfigurationGUI
Added all VS projects to one solution
Ignore dirty curl-source submodule
Merge branch '1.2.x'

Conflicts:
	client/Windows/ConfigurationGUI/Properties/version.cs
	client/Windows/ForestInstaller/Version.wxi
	client/Windows/version1.rc
	client/Windows/version2.rc
	client/version.h
	server/www/application/config/version.php
	version.txt