Fixed 4713: Sync event manager to -x v3.0
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss4713_SyncEventManager
Merge pull request #256 from dingpinglv/Iss4713_SyncEventManager

Fixed 4713: Sync event manager to -x v3.0