Preparing for Shibboleth login
Minor shibboleth tweaks
Adding invitations
Merge branch 'master' of github.com:tsauvine/o4

Conflicts:
	config/locales/curriculums.en.yml
	config/locales/curriculums.fi.yml
Adding invitations