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