Added status
Added status-line
Merge branch 'master' into feature/status

Conflicts:
	app/Resources/views/front.html.twig
	src/BionicUniversity/Bundle/UserBundle/Form/UserSettingsType.php
	src/BionicUniversity/Bundle/UserBundle/Resources/config/doctrine/User.orm.yml
Merge branch 'feature/status'