[jenkins-watchdog]add the time of single job
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins-watchdog]add the time of single job
update android-build.py for copying files about lua
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket

Conflicts:
	build/android-build.py
closed #4635: ControlSwitch's marksprite is shown at a wrong place
closed #3509: Skip one frame when _deltaTime equal to zero.
[Jenkins][ci skip]: add jenkins job configs
fix error that “lua-test/opengltest/shader retro effect” test case have no effect
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop_socket
Merge pull request #6104 from dumganhar/iss4635-constrolswitch

closed #4635: ControlSwitch's marksprite is shown at a wrong place
[AUTO][ci skip]: updating cocos2dx_files.json
Merge pull request #6112 from CocosRobot/update_cocosfiles_1396424454

[AUTO][ci skip]: updating cocos2dx_files.json
fix hd resource test-object-layer.tmx settings.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins-watchdog.py]remove extra build_time()
Merge pull request #6107 from boyu0/iss3509_physicsbody_moves_randomly_when_switch_foreground_background

closed #3509: Skip one frame when _deltaTime equal to zero.
Update CHANGELOG [ci skip]
Merge pull request #6114 from linchaogithub/develop

[Jenkins-watchdog]remove extra build_time()