repair bug: changedisplay(armature,i>=0) does not reblind parentbone
Merge pull request #1 from 2youyouo2/develop

merge kaile
Merge pull request #3 from geron-cn/develop

repair bug: changedisplay(armature,i>=0) does not reblind parentbone
[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
Reverse CONSTRUCTOR_ACCESS to public
Android crash fix on new devices
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 #4584, Add feature to force update the environment variables in setup.py.
Merge branch 'develop' into issue4584
Fixed #4637: Add loop parameter to Animation::initWithSpriteFrames function
Reverse CONSTRUCTOR_ACCESS to protected
Fixed #4637: Add predefined value indication in cpp
closed #3509: Skip one frame when _deltaTime equal to zero.
Label:Fine tune the declaration order of API.
[Jenkins][ci skip]: add jenkins job configs
fix error that “lua-test/opengltest/shader retro effect” test case have no effect