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
Merge pull request #876 from dingpinglv/develop

Update the reference of cocos2d-html5
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
move the native implementation of evalString to CCJavascriptJavaBridge.cpp
remove useless files from android.mk
Issue #5983: Modifying the test code for Advanced compression
Issue #5983: Modifying the test code for Advanced compression
update cocos2d-html5
Merge pull request #880 from VisualSJ/develop-rc

Issue #5983: Modifying the test code for Advanced compression
fix the height of label to 0
Merge pull request #879 from joshuastray/fix_reflection

move the native implementation of evalString to CCJavascriptJavaBridge.cpp
Issue #5993: Fix two minor issues
Merge pull request #881 from joshuastray/develop

fix wrong label height in moonwarrior
Feature #5995 add param “to”
Issue #5993: Fix deprecated setSelectedState function usage
Merge pull request #882 from wuzhiming/fb_5th

Feature #5995 add param “to” for Facebook dialog