1. temp commit
Merge branch 'qt51' of https://github.com/yinjimmy/cocos2d-x into qt51