fix...
Merge branch 'develop' of https://github.com/redmobile/cocos2d-x into develop