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:Resolve the bugs that some lua test cases can’t run
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developNewUI
use print_exc() instead of format_exc()
Merge pull request #4870 from heliclei/develop

use print_exc() instead of format_exc()
Merge pull request #4871 from samuele3hu/developNewUI

Fix:resolve the bugs that some lua test cases can’t run
Merge commit 'refs/pull/4795/head' of git://github.com/cocos2d/cocos2d-x into merge4795
Removes duplicated file in Android.mk
Merge pull request #4872 from dumganhar/merge4795

Merge PR #4795
[ci skip] Updates TestLua project for iOS and Mac.
Merge pull request #4873 from dumganhar/develop

[ci skip] Updates TestLua project for iOS and Mac.
Adds override keyword for override functions.
Merge pull request #4874 from dumganhar/develop

Adds override keyword for override functions.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4875 from CocosRobot/updategeneratedsubmodule_1388830744

[AUTO] : updating submodule reference to latest autogenerated bindings