Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of github.com:molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis
Hide manage tab if status is 'APPROVED'
Reject updates for APPROVED StudyDefinitions
small textual change for consistency
fix #1363
Merge branch 'master' of https://github.com/molgenis/molgenis
== to ===
Merge pull request #1405 from bartcharbon/master

#2398 As LifeLines datamanager I want modifying disabled for accepted study definitions
Enable Query with Search and other operators
Merge branch 'master' of github.com:molgenis/molgenis
Added startpage to options
Added sample EntityClasses
Rename
Added page
Prevent name collisions
fix annotators to make user management possible