fixed ui action will be wrong while loop play
resloved merge error
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
update change log
update version
update change log
Merge pull request #4189 from minggo/master

[ci skip]Update change log and version
hot fix：assetManagerTest cannot compile
Merge pull request #4191 from dabingnn/masterFix

[ci skip]hot fix：assetManagerTest cannot compile
Merge pull request #4188 from Dhilan007/master

bind studio and gui
[master] Adding missing file in TestJavascript.
[AUTO] : updating submodule reference to latest autogenerated bindings
Merge pull request #4195 from CocosRobot/updategeneratedsubmodule_1384237510

[AUTO] : updating submodule reference to latest autogenerated bindings[ci skip]
Merge pull request #4196 from dumganhar/master

[master iOS] Adding missing files in TestJavascript.
[Blackberry] Fixing Lua project compilation errors.
Merge pull request #4197 from dumganhar/master

[Blackberry] Fixing Lua project compilation errors.
hot fix：fix hellocpp link error on Xcode 5.0.1 bug
Merge pull request #4198 from dabingnn/masterfix

[ci skip]hot fix：fix hellocpp link error on Xcode 5.0.1 bug
hot fix：fix cpp template on mac version