LQE-267: refactor
LQE-267: refactor
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/utils/PageNavigator.java