correct the type detecting order forgetNodeTypeName
Merge pull request #2810 from dumganhar/master

Fixing compilation errors in TestLua for Win32.
new CCLabelTTF (static) create with fontDefinition method, and new CPP test using it
Merge pull request #2809 from edwardzhou/master

issue #2103: correct the type detecting order for Lua CCBProxy::getNodeTypeName.
Update AUTHORS [ci skip]
Merge pull request #2811 from carlomorgantinizynga/finalTTFLabelChanges

fixed #2265: new CCLabelTTF createWithFontDefinition method, and new test
Update AUTHORS [ci skip]
[AUTO] : updating submodule reference to latest autogenerated bindings
fixed #2161: don't close AssetManager
Merge pull request #2815 from minggo/master

fix a bug of Cocos2dxETCLoader.java
Merge pull request #2814 from CocosRobot/updategeneratedsubmodule_1370659717

[AUTO] : updating submodule reference to latest autogenerated bindings [ci skip]
fixed #2266:make CCFileUtil::getFileData() get data correctly
Merge pull request #2825 from minggo/master

make CCFileUtil::getFileData() get data correctly