[AUTO] : updating jsbinding automatically
Merge pull request #318 from CocosRobot/update_js_bindings_1398397505

[AUTO] : updating jsbinding automatically
Merge pull request #1 from cocos2d/master

update
repeat load file data in plist loader

js_PlistParser_parse only accept the file path, so don't need load the file data in js.
Merge pull request #321 from pandamicro/master

Add project path and folder structure into README
Fixed a bug of TestScene that it calls onEnter two times when it uses transition
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js into Iss_TestMain
Merge pull request #322 from dingpinglv/Iss_TestMain

Fixed a bug of TestScene that it calls onEnter two times when it uses transition
Refactor #4856: Refactor CCTMXLayer's API with pos parameter to support both pos and x, y parameters
fix bug
refactor getTileGIDAt,setTileGID,removeTileAt,getPositonAt in TMXLayer
Support fuzzy matching in the create project configuration.
Merge pull request #323 from joshuastray/master

Refactor #4856: Refactor CCTMXLayer's API with pos parameter to support both pos and x, y parameters
Merge pull request #324 from natural-law/master

Support fuzzy matching in the create project configuration.
Update the reference of submodule cocos2d-console.
Merge pull request #327 from natural-law/master

Update the reference of submodule cocos2d-console.
Update cocos console
remove the unless comment
Update the reference of submodule cocos2d-console.
Merge pull request #328 from natural-law/master

Update the reference of submodule cocos2d-console.