提交GASH修改
Merge branch 'blingstorm' of github.com:blingstorm/cocos2d-x into blingstorm