add player
Merge branch 'test_branch' of https://github.com/yinjimmy/cocos2d-x into test_branch