Update Cocos2d-x
Issue #5335: Make default template work for iOS and Mac
Merge pull request #432 from pandamicro/master

Update Cocos2d-x
fixed no print log
Merge pull request #28 from cocos2d/master

update cocos2d-js
Merge pull request #29 from chuanweizhang2013/master

fixed no print log
add rtres
Merge pull request #30 from chuanweizhang2013/master

add rtres
Merge pull request #433 from cocoscodeide/master

fixed win
Issue #5335: Fix js-moonwarriors compilation issue
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Merge pull request #434 from pandamicro/master

Sync Cocos2d-x Fix js-moonwarriors compilation issue
Merge pull request #435 from joshuastray/master

issue #5281: remove UIText renaming
[AUTO] : updating jsbinding automatically
Merge pull request #436 from CocosRobot/update_js_bindings_1401111257

[AUTO] : updating jsbinding automatically
Update docs
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
issue #5364: Change setText to setString
Merge pull request #437 from VisualSJ/master

issue #5364: Change setText to setString
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js