Mail, BO
Merge branch 'Toscan' into develop

Conflicts:
	src/Hoper/ContentBundle/Resources/config/routing.yml