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, /zh/controllers/components.rst and /zh/controllers/scaffolding.rst
Merge branch 'master' into zh
[zh_CN] remove English in page title
[zh_CN] follow en updates
Update understanding-model-view-controller.rst
Merge pull request #1834 from jmanubarreiro/patch-1

Update understanding-model-view-controller.rst
Add missing 'you', format to 80 char line limit
Merge pull request #1833 from blackpuppy/zh

[zh_CN] done /zh/controllers.rst, /zh/controllers/components.rst and /zh/controllers/scaffolding.rst
Merge branch 'master' into 2.6