updated catalog
Merge branch 'master' of https://github.com/cocos2d/cocos-docs

Conflicts:
	catalog/en.md
	catalog/zh.md
Updated catalog
Merge pull request #283 from linshun/master

updated catalog