fixed #482
Merge branch 'master' of https://github.com/chukong/quick-cocos2d-x