Merge branch 'bugfixing' of C:\Users\stanislav.sobolev\Desktop\Software\JAVA\labs-questionnaire-template with conflicts.
Displaying template tree need to be displayed
Displaying template tree with generating ID and name
fix
Merge remote-tracking branch 'origin/development' into bugfixing

Conflicts:
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/page/QuestionEditController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/question/Question.java
Merge branch 'development' into bugfixing2

Conflicts:
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/page/QuestionEditController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/page/TemplateTreeController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/question/GridQuestionController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/question/RangeQuestionController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/question/TextQuestionController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/question/Question.java
	labs-questionnaire-template-web/src/main/webapp/pages/templateEdit.xhtml
Merge branch 'development' into bugfixing2 + Editing name of sections and groups
fix bug (tree buttons)
fixed ID displaying (all nodes are displayed with ID)
tests uncommented + refactor
Merge remote-tracking branch 'origin/bugfixing' into bugfixing

Conflicts:
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/question/Question.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/questionnaire/GroupBean.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/questionnaire/SectionBean.java
little fixes: xml and displaying nodes
Merge remote-tracking branch 'origin/bugfixing' into bugfixing
fixed ID displaying (all nodes are displayed with ID)
Merge branch 'development' into bugfixing

Conflicts:
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/page/QuestionEditController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/question/GridQuestionController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/question/OptionsQuestionEditController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/question/Question.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/question/options/GridQuestionBean.java
Merge remote-tracking branch 'origin/bugfixing' into bugfixing

Conflicts:
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/question/Question.java
LQE-261 - Bug: node is not selecting
LQE-261 - Bug: node is not selecting
Merge remote-tracking branch 'origin/bugfixing' into development