Keep it up-to-date
Merge branch 'master' of github.com:emberjs-cn/www.emberjs.cn
Merge pull request #12 from GericLau/master

Translation: Defining a View
Translation: Inserting Views in Templates
Merge branch 'master' of https://github.com/emberjs-cn/www.emberjs.cn