calendar
Merge branch 'calendar' into dev-master

Conflicts:
	src/Lists/HandlingBundle/Resources/views/Sales/messages.html.twig
	src/Lists/HandlingBundle/Resources/views/SalesAdmin/messages.html.twig
	src/Lists/HandlingBundle/Resources/views/SalesDispatcher/messages.html.twig
#calendar