Merge remote-tracking branch 'fork_sync/master' into develop
Merge branch 'develop' of https://github.com/holmescn/quick-cocos2d-x into develop