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

Conflicts:
	cocos2d-html5_i/IronCity/cocos2d.js
	cocos2d-html5_i/IronCity/main.js