LQE-198 validation on empty question text field with error message
Merge branch 'development' of https://github.com/engagepoint/labs-questionnaire-template into development
Merge branch 'development' of
https://github.com/engagepoint/labs-questionnaire-template into
development

Conflicts:
	questionnaire-template-web/src/main/webapp/resources/questiontemplate/questionbuttons.xhtml
	questionnaire-template-web/src/main/webapp/resources/questiontemplate/questionbuttons2.xhtml
Merge branch 'development' of
https://github.com/engagepoint/labs-questionnaire-template.git into
development

Conflicts:
	questionnaire-template-web/src/main/java/com/engagepoint/controller/pagecontroller/TextQuestionController.java
	questionnaire-template-web/src/main/webapp/pages/questionEdit.xhtml
	questionnaire-template-web/src/main/webapp/templates/questionTemplate.xhtml
Merge branch 'development' of
https://github.com/engagepoint/labs-questionnaire-template.git into
development

Conflicts:
	questionnaire-template-web/src/main/java/com/engagepoint/bean/QuestionBeans/RangeQuestionBean.java
	questionnaire-template-web/src/main/java/com/engagepoint/bean/QuestionBeans/TextQuestionBean.java
	questionnaire-template-web/src/main/java/com/engagepoint/controller/pagecontroller/OptionsQuestionEditController.java
	questionnaire-template-web/src/main/java/com/engagepoint/controller/pagecontroller/QuestionEditController.java
	questionnaire-template-web/src/main/java/com/engagepoint/controller/pagecontroller/TextQuestionController.java
	questionnaire-template-web/src/main/webapp/pages/questionEdit.xhtml
	questionnaire-template-web/src/main/webapp/question-pages/chooseFromListQuestion.xhtml
	questionnaire-template-web/src/main/webapp/question-pages/rangeQuestion.xhtml