Merge pull request #65 from cocos2d/master

update js
modify rendmode
Merge pull request #66 from cocos2d/master

update js
Merge branch 'master' of https://github.com/cocoscodeide/cocos2d-js
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
add get platform
Merge pull request #67 from cocos2d/master

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

fixed some bugs
[AUTO] : updating jsbinding automatically
Merge pull request #662 from CocosRobot/update_js_bindings_1407233316

[AUTO] : updating jsbinding automatically
fixed getplatform
fix history undefined bug on jsb
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js

Conflicts:
	frameworks/js-bindings/bindings/manual/ScriptingCore.h
Merge pull request #69 from chuanweizhang2013/master

update js
modify some ui position.let it can display right in iPad mini
Merge pull request #663 from joshuastray/master

fix history undefined bug on jsb
modify version.json
fix plugin-x test for desktop platforms
Merge pull request #70 from chuanweizhang2013/master

modify version.json