fixed several bugs
working progress in biobankconnect
added multiSearch in multiple documentTypes
tweaked the score
Jpa DataApi
Replaced Database with DataApi
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-omx-dataexplorer/src/main/java/org/molgenis/dataexplorer/controller/DataExplorerController.java
Remove unused import
#2150
change a line to comment
#2150
merged with molgenis master
#2150
Merge branch 'master' of github.com:molgenis/molgenis

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
#2150
Merge branch 'master' of github.com:molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/java/org/molgenis/omx/WebAppSecurityConfig.java
integrate study definition service (work in progress)
#2150
#2150
Removing unnecessary classes
#2150
Merge branch 'master' of github.com:molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/resources/molgenis_ui.xml