fix: when use different count custom properties in CocosBuilder will get wrong custom properties in game
Update js_bindings_ccbreader.cpp

owner can equal null when ccbreader load a file
proj.mac FontTest fix (was not rendering TTFs)
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x
add a xaml page to hello-cpp project
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.
Add lua script trigger bindings for CocoStudio
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_cocostudio

Conflicts:
	extensions/CocoStudio/Trigger/TriggerMng.cpp
Resolve lua ios project compile error
Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into master_cocostudio
Add a newline
Add a newline
Add a newline
update vs project for gui change.
Merge pull request #4762 from Dhilan007/master_vs

update vs project for gui change.
fix some error in jsb_cocos2d_studio.js
Merge pull request #4763 from Dhilan007/master_vs

fix some error in jsb_cocos2d_studio.js
Add lua_cocos2d_studio.lua to contain all trigger related define