Merge branch 'develop' of https://github.com/chukong/quick-cocos2d-x into develop
Merge branch 'develop' of https://github.com/chukong/quick-cocos2d-x into develop
update player for mac
Merge pull request #333 from yinjimmy/develop

move