One forgotten commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	View/templates/header.html.twig
	View/templates/statistics.html.twig