Merge branch 'FRBEV-24' of https://github.com/freshbytero/evaluationsapp

Conflicts:
	src/Freshbyte/EvaluationBundle/EventListener/LoginListener.php
	src/Freshbyte/FormBundle/Controller/FormController.php
	src/Freshbyte/FormBundle/Resources/views/Form/editForm.html.twig
	src/Freshbyte/FormBundle/Resources/views/Form/form.html.twig
	src/Freshbyte/FormBundle/Resources/views/Form/showForm.html.twig
Merge branch 'master' of https://github.com/freshbytero/evaluationsapp