fix some repo
Merge https://github.com/cocos2d/cocos2d-x
Merge https://github.com/cocos2d/cocos2d-x
fix some warnins
Merge pull request #1908 from minggo/master

fix some warnings