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
RunAsManager annotation
Replace Database with DataService
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/java/org/molgenis/omx/MolgenisWebAppSecurityConfig.java
	molgenis-app-omx/src/main/java/org/molgenis/omx/WebAppDatabasePopulatorServiceImpl.java
	molgenis-app-omx/src/main/resources/molgenis.properties
	molgenis-core/src/main/java/org/molgenis/generators/server/EntityControllerGen.java.ftl
	molgenis-security/src/main/java/org/molgenis/security/account/AccountService.java
	molgenis-security/src/main/java/org/molgenis/security/user/MolgenisUserServiceImpl.java
make DasOmxDataSource compile
Migrate importer
Migrate dataexplorer aggregate
Remove unique
metadata cache
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/java/org/molgenis/omx/WebAppDatabasePopulatorServiceImpl.java
	molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/study/StudyDataRequestDecorator.java
	molgenis-security/src/main/java/org/molgenis/security/account/AccountService.java
	molgenis-security/src/main/java/org/molgenis/security/user/MolgenisUserService.java
	molgenis-security/src/main/java/org/molgenis/security/user/MolgenisUserServiceImpl.java
	molgenis-security/src/main/java/org/molgenis/security/user/UserAccountController.java
	molgenis-security/src/main/java/org/molgenis/security/usermanager/UserManagerServiceImpl.java
Fix merge
Migrate EntityController
Migrate protocolview and protcolmanager
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/java/org/molgenis/omx/WebAppDatabasePopulatorServiceImpl.java
	molgenis-app-omx/src/main/java/org/molgenis/omx/WebAppSecurityConfig.java
	molgenis-app-omx/src/test/java/org/molgenis/omx/controller/BackgroundControllerTest.java
	molgenis-omx-core/src/main/java/org/molgenis/omx/cart/ShoppingCartController.java
	molgenis-omx-dataexplorer/src/main/java/org/molgenis/dataexplorer/controller/DataExplorerController.java
	molgenis-omx-dataexplorer/src/main/java/org/molgenis/entityexplorer/controller/EntityExplorerController.java
	molgenis-omx-protocolviewer/src/main/java/org/molgenis/omx/order/OrderStudyDataService.java
	molgenis-security/src/main/java/org/molgenis/security/account/AccountService.java
Fix merge
Migrate genomebrowser
Merge branch 'master' of https://github.com/molgenis/molgenis

Conflicts:
	molgenis-app-omx/src/main/java/org/molgenis/omx/WebAppSecurityConfig.java
	molgenis-omx-core/src/main/java/org/molgenis/omx/protocol/ProtocolTable.java
	molgenis-omx-core/src/main/java/org/molgenis/omx/search/AsyncDataSetsIndexer.java
	molgenis-search-elasticsearch/src/main/java/org/molgenis/elasticsearch/ElasticSearchService.java
fixed a bug in ontology-annotator.js
Merge branch 'master' of https://github.com/molgenis/molgenis into work