Merge pull request #2261 from dennishendriksen/master

Fix Bootstrap errors
Fix data explorer entity select in case of predefined entity
Merge branch 'master' of https://github.com/molgenis/molgenis