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