** Added all projects to parent
** Made education types show up on wizard view
Merge branch 'FTR-108_setup_wizard' of https://github.com/otavanopisto/pyramus into FTR-108_setup_wizard
Education Types wizard phase
Merge branch 'FTR-108_setup_wizard' of
https://github.com/otavanopisto/pyramus into FTR-108_setup_wizard

Conflicts:
	pyramus/src/main/java/fi/pyramus/views/system/setupwizard/EducationTypesSetupWizardViewController.java
** Wizard view for subjects
Merge branch 'FTR-108_setup_wizard' of
https://github.com/otavanopisto/pyramus into FTR-108_setup_wizard

Conflicts:
	pyramus/src/main/webapp/WEB-INF/pagemapping.properties