Merge branch 'master' of https://github.com/molgenis/molgenis into algorithm-cleanup
Merge branch 'master' of https://github.com/molgenis/molgenis into algorithm-cleanup
Merge branch 'master' of https://github.com/molgenis/molgenis into algorithm-cleanup
Merge branch 'master' of https://github.com/molgenis/molgenis into algorithm-cleanup
molgenis-scripts initial commit
Added execute links
Move FeedbackControllerTest to proper package.
Test for property searching in MolgenisDBSettings
Merge branch 'master' of https://github.com/molgenis/molgenis
Update menu manager UI description, query string fix
Merge pull request #1732 from dennishendriksen/master

Update menu manager UI description, query string fix
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix imports.
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/r-script-execution

Conflicts:
	molgenis-app-omx/src/main/resources/molgenis_ui.xml
Merge branch 'master' of https://github.com/molgenis/molgenis
Fix js compiler error in dataexplorer.js
Merge pull request #1735 from dennishendriksen/master

Fix js compiler error in dataexplorer.js
Merge branch 'master' of https://github.com/molgenis/molgenis into feature/r-script-execution
Merge branch 'master' of https://github.com/molgenis/molgenis
Merge branch 'master' of https://github.com/molgenis/molgenis into algorithm-cleanup