move
Merge branch 'develop' of github.com:chukong/quick-cocos2d-x into develop
cleanup