proj.mac FontTest fix (was not rendering TTFs)
change play interface name
change play interface name
Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x

Conflicts:
	extensions/CocoStudio/Armature/animation/CCArmatureAnimation.cpp
	extensions/CocoStudio/Armature/animation/CCArmatureAnimation.h
revert change
temp commit
modify for project option
modify for editor
Modify scene reader
fixed #3460
 1. add removeall on Destroy TriggerMng.
 2. Support for the same json file  parsed on 2.x and 3.x.
Merge pull request #1 from liamcindy/NuttyUI

Nutty ui
Add refresh layout method
fixed CCArmature update
fixed CCArmatureAnimation.pkg
Modify actionnode
change LuaCocoStudio.cpp
Modify actionnode
Add new samples
Add listview and pageview reader
Modify reader