update ui animation with frame ease type
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
merge from develop branch
resolved ui animation easing error for develop branch
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
fix bad name variable
Merge pull request #4864 from daltomi/test

fix bad name variable CCDirector
Update AUTHORS [ci skip]
Removes wrong resource in TestJavascript project.
Uses blue folder for iOS & Mac resources to prevent adding new resources.
sharedXXX -> getInstance, purgeXXX -> destroyInstance.
Refactors search path setting for TestJavascript.
closed #3580:  FileUtilsTest->TextWritePlist crashes
Reverts GUIReader definition. it should be inherited from Object to make bindings happy.
Merge pull request #4867 from dumganhar/iss3580-write-tofile

closed #3580:  FileUtilsTest->TextWritePlist crashes
Merge pull request #4835 from chuanweizhang2013/develop

add cocos files generate script
Merge pull request #4865 from dumganhar/testjs-bugfix

Some fixes for TestJavascript
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4869 from CocosRobot/updategeneratedsubmodule_1388821249

[AUTO] : updating submodule reference to latest autogenerated bindings