/a initial project
Add beans.xml
remove aplication.xml
first commit
Add Managed Bean for wizard-web
Add aplication.xml
Delete jar.xml
Delete servlet fro, wizard-web
Working with jBehave Test
Merge branch 'development' of https://github.com/engagepoint/labs-questionnaire-wizard into development
Finished JBehave Tests.  Navigation works fine.
Merge branch 'master' into development

Conflicts:
	.gitignore
	pom.xml
	wizard-ear/pom.xml
	wizard-ear/src/main/application/META-INF/application.xml
	wizard-ejb/pom.xml
	wizard-ejb/src/main/resources/META-INF/beans.xml
	wizard-web/pom.xml
	wizard-web/src/main/webapp/WEB-INF/faces-config.xml
	wizard-web/src/main/webapp/WEB-INF/web.xml
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
fixed application.xml
fixed application.xml
fixed application.xml
fix aplication.xml
added next button