game setting
Merge branch 'master' of https://github.com/zfnlj/zgc

Conflicts:
	Resources/GUI/ui_elem.plist
	Resources/GUI/ui_elem.png