Merge pull request #1526 from dennishendriksen/master

MolgenisUser changes
Merge pull request #1527 from dennishendriksen/master

Show field labels instead of field names in forms
Merge branch 'master' of https://github.com/molgenis/molgenis