MVC-49, MVC-42, refactored cake_view.
Merge branch 'master' of github.com:Diana22/ProjectMVC