Merge pull request #892 from dennishendriksen/master

Bug fix: non-actived users can login + encode password on reset
fixing bug, description is now shown
Merge pull request #894 from RoanKanninga/master

fixing bug, description is now shown
Merge branch 'master' of https://github.com/molgenis/molgenis