proj.mac FontTest fix (was not rendering TTFs)
add a xaml page to hello-cpp project
update cocos2d-x version string
Merge pull request #4741 from minggo/master

update cocos2d-x version string
Merge pull request #4740 from Dhilan007/master_studio

Master nutty modify framework newwidget
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4749 from CocosRobot/updategeneratedsubmodule_1388469669

[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4751 from Dhilan007/master_studio

fix miss file for lua binding project on vs
Modify marmalade mk
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
Merge pull request #4756 from nutty898/master_nutty_modify_framework_modifytestcppmk

Modify marmalade mk
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