Renamed chapter 4.
Improved grammar and sentence structure of the programming guide.
Fixed use of an odd colon ':' (integer value 65306). Changed it to a default colon (integer value 58).
Merge remote-tracking branch 'upstream/master' into js-programming-guide
Moved chapter 4.5 to the new chapter 4 folder.
Update en.md
Processed feedback by Shun Lin.
Merge branch 'js-programming-guide' of https://github.com/simondel/cocos-docs into js-programming-guide
[Cocos2d-JS PG] Add chinese doc for director of game
[Cocos2d-JS PG] Improve english doc for director of game
Merge branch 'master' of https://github.com/cocos2d/cocos-docs
Merge branch 'js-programming-guide' of https://github.com/simondel/cocos-docs into mergeSimon
Merge pull request #1 from pandamicro/mergeSimon

Solve conflict for js-programming-guide branch
Merge pull request #557 from simondel/js-programming-guide

Improved grammar and sentence structure in the JS programming guide.