Issue #5993: Fix Timeline's addTouchEventListener issue with the conflict of user object
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Issue #5993: Update cocos ui resources
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-js into develop
Update html5 engine
Update -x engine
Merge pull request #877 from pandamicro/develop

Issue #5993: Update cocos ui resources