Terminei o improving controllers and templates
Merge branch 'improving-controllers-and-templates'