proj.mac FontTest fix (was not rendering TTFs)
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
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
Merge pull request #4760 from samuele3hu/master_cocostudio

Add lua script trigger bindings for CocoStudio
Merge pull request #4367 from lajos/macfonttest

proj.mac FontTest fix (was not rendering TTFs)