updated docs
Merge branch 'master' of https://github.com/chukong/cocos-docs
Merge pull request #484 from gloryming/master

updated docs