#2132
Merge branch 'master' of github.com:molgenis/molgenis

Conflicts: Merged
	molgenis-security/src/main/resources/templates/view-usermanager.ftl
#2132
Tests and UI changes
Merge pull request #849 from jjettenn/master

#2132 User Manager