Merge remote-tracking branch 'origin/templating' into dev-master

Conflicts:
	src/Lists/HandlingBundle/Resources/views/SalesAdmin/edit.html.twig
wizard
Merge branch 'staging' into templating
translating
add pregress design handlinglist dashboard
step 1 translating