Merge branch 'master' of https://github.com/chuanweizhang2013/cocos2d-js
Merge pull request #442 from cocoscodeide/master

update template project js
fixed #5368: rename (s|g)etText to (s|g)etString in jsb_property_apis.js
Issue #5335: Update read me
Issue #5335: Fix js-tests 64bit compilation issue with pluginx
Issue #5335: Refactor EditBox g|setText g|setString
Issue #5335: Update upgrade guide
rename getText->getString for editbox
Merge pull request #443 from joshuastray/master

fixed #5368: rename (s|g)etText to (s|g)etString in jsb_property_apis.js
Merge pull request #444 from pandamicro/master

Prepare for release
[AUTO] : updating jsbinding automatically
Update Cocos2d-html5
Merge pull request #445 from CocosRobot/update_js_bindings_1401174607

[AUTO] : updating jsbinding automatically
Merge pull request #446 from pandamicro/master

Update Cocos2d-html5
Closed #5390: main.js throw error
Merge pull request #448 from VisualSJ/master

Closed #5390: main.js throw error
Update the reference of submodule cocos2d-console.
Merge pull request #451 from natural-law/master

Update the reference of submodule cocos2d-console.
Issue #5410: Creating new actions
Merge pull request #452 from VisualSJ/master

Issue #5410: Creating new actions