Created testBean for testing Generator
updated generator
Created testBean for testing Generator
updated generator
weewe
Merge branch 'development' of https://github.com/engagepoint/labs-questionnaire-wizard into development

Conflicts:
	wizard-web/src/main/webapp/WEB-INF/bootstrap-templates/bootstrap-maincontent.xhtml
	wizard-web/src/main/webapp/WEB-INF/bootstrap-templates/bootstrap-template.xhtml