#376
Merge branch 'staging' into templating

Conflicts:
	src/Lists/HandlingBundle/Resources/views/SalesAdmin/edit.html.twig
add contacts form
translating
Create message form