Merge branch 'master' of https://github.com/molgenis/molgenis
Enable Query with Search and other operators
Added startpage to options
Added sample EntityClasses
Rename
Added page
Prevent name collisions
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
Limit symbol
Merge pull request #1410 from erwinwinder/master

MetaDataExplorer markup
change hardcoded url to relative one (annotators)
Merge pull request #1412 from bartcharbon/master

change hardcoded url to relative one (annotators)
Merge branch 'master' of github.com:molgenis/molgenis
Merge pull request #1409 from jjettenn/master

Fix: Exception on data explorer after a failed upload of a data file #1382;
Merge branch 'master' of https://github.com/molgenis/molgenis
fix javascript escaping in error message
Merge branch 'master' of github.com:molgenis/molgenis