Merge pull request #292 from chuanweizhang2013/master

update cocos2d-js
Update the reference of submodule cocos2d-console.
Merge pull request #293 from natural-law/master

Update the reference of submodule cocos2d-console.
Improve read me
Merge branch 'master' of https://github.com/cocos2d/cocos2d-js
Update Cocos2d-x
Merge pull request #294 from pandamicro/master

Improve read me
Update the reference of submodule cocos2d-console.
Merge pull request #295 from natural-law/master

Update the reference of submodule cocos2d-console.
Merge pull request #24 from cocos2d/master

update cocos2d-js