[zh_CN] done /zh/models.rst
[zh_CN] done /zh/models.rst
Merge pull request #1827 from blackpuppy/zh

[zh_CN] done /zh/models.rst
update controllers.rst
Merge branch 'oschina' into zh-work
[zh_CN] fix sphinx build warning in /zh/controllers.rst
Update vendor paths in ja/sr
[fr] update translation

- follow #1824
- follow 20fb55cd
Follow #1404 in ja/sr
restore standard template
webroot/className clash

When someone has a folder in the webroot directory can't acces to their class. Directly redirected to webroot/className folder instead of their class.
Merge pull request #1831 from mtkocak/master

webroot/className clash
Put file shadowing docs closer to url/route conventions.
[zh_CN] done /zh/controllers.rst

- sync with en
- proofread
- wrap lines at 80 column
[zh_CN] remove English in page title
Merge branch 'master' into zh-work

Conflicts:
	zh/contents.rst
	zh/epub-contents.rst
	zh/models.rst
	zh/pdf-contents.rst
resolved!