Updating JS-Test to the latest version.
[master] [JSB] Bind cc.Armature.getShapeList and setBody.
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x into jsb-armature-fix
Merge pull request #25 from cocos2d/master

Merge with upstream.
Merge branch 'jsb-armature-fix' of https://github.com/dumganhar/cocos2d-x into jsb-armature-fix
Fixing Linux build fails after merging WInRT.
Fixing indention.
Merge pull request #3823 from dumganhar/jsb-armature-fix

[master] [JSB] Bind cc.Armature.getShapeList and setBody.
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_test