Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
MolgenisUser.Email must be unique
Merge branch 'master' of https://github.com/molgenis/molgenis
overwrite default admin email address from molgenis-server.properties
fix setting bug (swap datamanager/researcher annotation), set default email addresses, set default activation mode to user
make setting key public
Merge pull request #431 from dennishendriksen/master

LifeLines initialization changes + MolgenisUser.Email unique