....
Merge branch 'master' of github.com:FireLeaf/XGame

Conflicts:
	XGame/XSrc/XGame.suo
......