Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
Merge branch 'master' of https://github.com/Zhangzhiyi/cocos2d-x
Merge branch 'master' of https://github.com/Zhangzhiyi/cocos2d-x
Merge branch 'master' of https://github.com/Zhangzhiyi/cocos2d-x
DialogLayerMan触摸事件管理