Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Change password flow
Add token form
Add attributes
Added description
Make Jenkins happy
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix for issue #1451
Remove System.out
Fix issue#902
Hide manage tab when user hasn't write permission
Merge branch 'master' of https://github.com/molgenis/molgenis
Replace Derby by Hsqldb, because Derby doesn't support distinct on text column
Fix issue #1490
Merge pull request #1491 from erwinwinder/master

Change password
Merge pull request #1495 from bartcharbon/master

Change columnnames for GenomeBrowser to VCF standard. + gb bugfixes
ChangePassword is required
Merge pull request #1500 from erwinwinder/master

ChangePassword is required
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-security/src/main/java/org/molgenis/security/MolgenisSecurityWebAppDatabasePopulatorServiceImpl.java