relauch can not use
Merge pull request #31 from chuanweizhang2013/master

fixed mac relauch
Merge pull request #439 from pandamicro/master

Issue #5335: Update read me with Github note
issue #5364: Change setText to setString
Merge pull request #440 from VisualSJ/master

issue #5364: Change setText to setString
Merge pull request #441 from cocoscodeide/master

fixed mac relaunch
add lock to get file name
Merge pull request #32 from bofeng-song/master

add lock to get file name
fix compiled err
Merge pull request #33 from bofeng-song/master

fix compiled err
Merge pull request #34 from cocos2d/master

update js
ios android runtime
Merge pull request #442 from cocoscodeide/master

update template project 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