** Fixed typo
Admin password
** Made education types an earlier stage in setup
Merge branch 'FTR-108_setup_wizard' of
https://github.com/otavanopisto/pyramus.git into FTR-108_setup_wizard

Conflicts:
	pyramus/src/main/java/fi/pyramus/views/system/setupwizard/SetupWizardPageFlowController.java
	pyramus/src/main/webapp/scripts/gui/system/setupwizard/subjects.js
Merge branch 'FTR-108_setup_wizard' of
https://github.com/otavanopisto/pyramus.git into FTR-108_setup_wizard

Conflicts:
	pyramus/src/main/java/fi/pyramus/views/system/setupwizard/SubjectsSetupWizardViewController.java
	pyramus/src/main/webapp/scripts/gui/system/setupwizard/subjects.js