Education subtypes setup wizard view
Merge branch 'FTR-108_setup_wizard' of https://github.com/otavanopisto/pyramus.git into FTR-108_setup_wizard
** Contact types setup wizard view
Merge branch 'FTR-108_setup_wizard' of
https://github.com/otavanopisto/pyramus.git into FTR-108_setup_wizard

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