merge official code
Merge branch 'v3' of git://github.com/redmobile/cocos2d-x into v3