update docs
Merge branch 'master' of github.com:chukong/cocos-docs
Merge pull request #342 from dualface/master

update docs