Adapted DTOs and AnswerController for QuestionSet imbrication
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	app/eu/factorx/awac/service/impl/ReportServiceImpl.java
Adapted DTOs and AnswerController for QuestionSet imbrication
Merged conflicts
Fixed merge errors