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

Conflicts:
	src/Freshbyte/FormBundle/Controller/FormController.php
	src/Freshbyte/FormBundle/Entity/AnsweredQuestion.php
	src/Freshbyte/FormBundle/Entity/Category.php
	src/Freshbyte/FormBundle/Entity/CategoryCollection.php
	src/Freshbyte/FormBundle/Entity/FormAnswer.php
	src/Freshbyte/FormBundle/Entity/SubmittedForm.php
Merge branch 'FRBEV-18' of https://github.com/freshbytero/evaluationsapp into FRBEV-18