Merge pull request #1 from cocos2d/master

g
add en.md
issue #3539  add one article about JSB-manually
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge remote-tracking branch 'upstream/master'
fix a indentation problem
update parkour game with javascript chapter2
Update summary_release_20140107.md
Merge pull request #89 from linshun/master

Added title of the articles
fix typos reported at http://www.cocos2d-x.org/forums/6/topics/42082?r=42179#message-42179
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
add online showcase for chapter 3.
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge pull request #90 from Ivenyang/master

add online showcase for chapter 3.
review chapter3
add hello word index.html.
delete online showcase
add more items into catalog as the docs plan.
adjust v3.0 data structures in catalog