init
Merge branch 'master' of github.com:trarck/cocos2d-x-lua