Commit cocos2d-x and our project
Merge branch 'master' of https://github.com/lunamoonjm/GameFactory