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
ignore [] in command [console run].
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
for test close project in cocos-console-test.py.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
[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
add-close app in console-test.py.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
closed #4529: Stroke size and shadow offset don't consider ContentScaleFactor
closed #4530: Using 'Outside stroke' instead of 'Inside Stroke' for Label generated by 'Font name'. And fix stroke could not work on iOS7.
LabelTest , changed stroke color  to blue.
Adds another test for stroke.
Issue #3897: Make Constructors public in Cocos2d-JS
Merge pull request #4 from pandamicro/develop

Issue #3897: Make Constructors public in Cocos2d-JS