TEXT question is done
CHECKBOX is done without default-answers
CHECKBOX default-answers is done
CHOOSEFROMLIST, MULTIPLECHOICE are done
useless methods are removed
Date, Time are done
LQE-252 - improve XML for Rules fields(JAXb)
small refactor
Fixed id, import, xml-mapping
Id moved in BasicBean
Merge remote-tracking branch 'origin/XMLsynchronization' into development

Conflicts:
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/page/QuestionRuleController.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/controller/page/TemplateTreeController.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/ChooseFromListQuestionBean.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/question/options/MultipleChoiceQuestionBean.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/question/options/OptionsQuestion.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
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/questionnaire/TemplateBean.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/utils/XmlImportExport.java
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/questionnaire/SectionBean.java
Merge remote-tracking branch 'origin/development' into development

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/BasicBean.java
	labs-questionnaire-template-web/src/main/java/com/engagepoint/model/questionnaire/GroupBean.java
Merge remote-tracking branch 'origin/development' into development
merging with XMLsynchronization