Merge origin/test into test

Conflicts:
	src/Metrostudio/ContaktaBundle/Resources/views/Contact/list_show.html.twig