shanee thing
Merge branch 'master' of https://github.com/ShaneeN/cocos2d-x