adjust code, project and make file to make it compiled with cocos2d-x v2 branch
Merge branch 'master' of https://github.com/stubma/cocos2dx-better