Prepared 2.0.0-DEMO version. Work in progress. Committed to master branch
Prepared 2.0.0-DEMO version. Work in progress. Committed to master branch
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/bean/WizardDataModelGenerator.java
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/bean/WizardForm.java
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/questions/WizardQuestion.java
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/xml/controllers/XmlController.java
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/xml/parser/XmlCustomParser.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/listener/UINavigationPhaseListener.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/model/NavigationData.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/ui/UIComponentGenerator.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/ui/validators/ComponentValidator.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/upload/FileUploadController.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/bean/WizardDataModelGenerator.java
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/bean/WizardForm.java
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/questions/WizardQuestion.java
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/xml/controllers/XmlController.java
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/xml/parser/XmlCustomParser.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/listener/UINavigationPhaseListener.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/model/NavigationData.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/ui/UIComponentGenerator.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/ui/validators/ComponentValidator.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/upload/FileUploadController.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/bean/WizardDataModelGenerator.java
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/bean/WizardTopic.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/ui/UIComponentGenerator.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/ui/validators/ComponentValidator.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-ejb/src/main/java/com/engagepoint/labs/wizard/bean/WizardDataModelGenerator.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java
	wizard-web/src/main/java/com/engagepoint/labs/wizard/ui/UIComponentGenerator.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java
Merge remote-tracking branch 'origin/development'

Conflicts:
	wizard-web/src/main/java/com/engagepoint/labs/wizard/controller/UINavigationBean.java