gameScene coding rebuild
Merge branch 'master' of https://github.com/yuye-liu/CocostudioIronCity

Conflicts:
	cocos2d-html5_i/IronCity/src/scene/GameScene.js
Merge branch 'master' of https://github.com/yuye-liu/CocostudioIronCity

Conflicts:
	cocos2d-html5_i/IronCity/src/layer/Player.js