tweak some assets
Merge branch 'master' into assetsConfig

Conflicts:
	Resources/views/base_layout.html.twig