Adaptation design
Merge branch 'master' of https://github.com/damienlebert/Athena.git

Conflicts:
	app/Resources/views/layout.html.twig
	bower.json