xml
Merge branch 'merge_xml' of https://github.com/trunone/GPPlatformMain into Strategy

Conflicts:
	Linux/project/sks/main.cpp