fixed merge errors
Merge branch 'development' of https://github.com/engagepoint/labs-questionnaire-wizard into development
VALERA WANTED!
Merge branch 'development' of https://github.com/engagepoint/labs-questionnaire-wizard into development