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
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
Merge pull request #1406 from bartcharbon/master

fix annotators to make user management possible
Fix: Exception on data explorer after a failed upload of a data file
#1382; new added OMX repo's and LUT repo's are removed if import fails
Merge branch 'master' of github.com:molgenis/molgenis
FIX: test failed
Fix id attribute name collision (data Roan)
First version limit freemarker method
Merge pull request #1407 from erwinwinder/master

MetaDataExplorer and fix for import protocol with featurename 'id'
Markup