add Login and MolgenisSettings bean
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix compile errors for pullrequest #187
Merge pull request #200 from dennishendriksen/master

Fix compile errors for pullrequest #187