fix: when use different count custom properties in CocosBuilder will get wrong custom properties in game
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
fixed CCBatchNode draw
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
Revert "add a xaml page to hello-cpp project"

This reverts commit 71ec532c610dde313c8167f5eee26c51d1419727.
change interface
use 'with' instead of 'by'
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
change interface from "by" to "with"
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x
fixed lua compile
issue #3478 update SceneTest.
Merge branch 'master' into #3478
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x

Conflicts:
	scripting/lua/cocos2dx_support/LuaCocoStudio.cpp
Upload Resources.
update submodule
fixed lua compile
update Samples Resources.
Update Hd Resources。
issue #3478 update not hd resources.
issue #3478
      1. replace new Armature reader to older.
      2. fixes Effect component test can't show hd resouces.