2013/7/4
Merge branch 'xml'

Conflicts:
	Linux/project/sks/main.cpp