Update README.md
Merge branch 'master' of github.com:cocos2d/cocos-docs

Conflicts:
	README.md
resolve con flits in root/readme.md