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
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
Merge pull request #4202 from dabingnn/masterfix

[ci skip]hot fix：fix cpp template on mac version
hot fix：fix cpp template on IOS version
hot fix：fix lua template on IOS version
hot fix：fix hello lua can not link on IOS
Merge branch 'master' of git://github.com/cocos2d/cocos2d-x
hot fix：fix test lua can not link on IOS
Fix javascript template project compile fail.
fix some error for studio binding.
Merge pull request #4217 from Dhilan007/master

[ci skip]Fix javascript template project compile fail.
Merge pull request #4218 from dabingnn/masterfix

[ci skip]Masterfix
Merge pull request #4219 from Dhilan007/master

[ci skip]fix some error for studio binding.
replace nullptr to NULL