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

move