conflict 2
Merge branch 'master' of https://github.com/Ohgo/Cocos2dxUIP