deleted some lines
Merge branch 'master' of github.com:bionic-university/sparrow
Add admin panel
Merge branch 'master' into feature/admin_panel

Conflicts:
	src/BionicUniversity/Bundle/UserBundle/Controller/Front/UserController.php
	src/BionicUniversity/Bundle/UserBundle/Resources/views/User/Front/profile.html.twig
	src/BionicUniversity/Bundle/UserBundle/Resources/views/User/Front/settings.html.twig
Merge branch 'feature/admin_panel'