Merge branch 'master' of github.com:freshbytero/evaluationsapp into FRBEV/7-login-form

Conflicts:
	src/Freshbyte/EvaluationBundle/Controller/EvaluationController.php
	src/Freshbyte/EvaluationBundle/Resources/config/routing.yml
Fixed merge conflicts.