Settings
Merge branch 'master' into feature/settings

Conflicts:
	src/BionicUniversity/Bundle/UserBundle/Resources/views/User/Front/about.html.twig
Merge branch 'feature/settings'