Merge branch 'master' of git://github.com/cocos2d/cocos2d-x into jsb-armature-fix
Merge branch 'jsb-armature-fix' of https://github.com/dumganhar/cocos2d-x into jsb-armature-fix
Fixing Linux build fails after merging WInRT.