watchdog
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
watchdog