Keep up-to-date and translate testing guides.
Merge branch 'master' of github.com:emberjs-cn/www.emberjs.cn
Merge branch 'master' of github.com:emberjs-cn/www.emberjs.cn
Merge branch 'master' of github.com:emberjs-cn/www.emberjs.cn

Conflicts:
	source/bilingual_guides/getting-started/adding-a-route-and-template.md
	source/guides/getting-started/adding-a-route-and-template.md