Corrige conflitos em Home/index.html.twig
Merge branch 'master' of github.com:infocorp/affemat