Merge branch 'develop' of https://github.com/dualface/quick-cocos2d-x into develop
timer
Merge branch 'develop' of https://github.com/wanghehacker/quick-cocos2d-x into develop