Update cakephp-conventions.rst
Merge pull request #2075 from eBug/patch-1

Update cakephp-conventions.rst