Merge branch 'master' of github.com:infocorp/affemat into prod
Alteração no link de imagens
Merge branch 'prod' of git.pagodabox.com:affemat into prod

Conflicts:
	src/Infocorp/Bundle/AffematBundle/Resources/views/Home/index.html.twig