Updates to latest version of cocos2d-x
Merge branch 'develop' of github.com:cocos2d/cocos2d-player into develop