reset styles
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/Resources/views/base.html.twig
reset styles