[Jenkins] fix pending url
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developEventTrigger

Conflicts:
	tools/tojs/cocos2dx.ini
	tools/tolua/cocos2dx.ini
closed #4097: Adds missing include.
Merge pull request #5403 from samuele3hu/developEventTrigger

close #4094: [Lua] Rename EGLView to GLView and deprecate EGLView
Merge pull request #5409 from lmskater/fix_trigger_url

[Jenkins] fix pending url
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5411 from CocosRobot/updategeneratedsubmodule_1392889932

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #5408 from dumganhar/iss4097-disable-script

closed #4097: Adds a macro to disable inserting script binding relevant codes.
Merge pull request #5393 from heliclei/console-autotest

add console autotest support
[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
Merge pull request #5412 from CocosRobot/update_cocosfiles_1392891685

[AUTO][ci skip] : updating tools/project-creator/module/cocos_files.json
closed #4096: add s3tc bitmap with no mipmaps test case.
Merge pull request #5414 from boyu0/iss4096_add_test_s3tc_bitmap_with_on_mipmap

closed #4096: add s3tc bitmap with no mipmaps test case.
Merge commit 'refs/pull/5232/head' of git://github.com/cocos2d/cocos2d-x into merge5232
closed #4101: No callback is invoked when websocket connection fails
Merge pull request #5415 from dumganhar/merge5232

closed #4101: No callback is invoked when websocket connection fails
Update AUTHORS [ci skip]
Update CHANGELOG [ci skip]
Merge pull request #5059 from zhiqiangxu/useless_code_in_scrollview

delete useless code in deaccelerateScrolling
Update AUTHORS [ci skip]