Merge branch thehyve/master into transmart/master
Merge branch thehyve/master into transmart/master
Remove data types not implemented upstream
Merge thehyve/master into highdim_for_transmart

Conflicts:
	src/groovy/org/transmartproject/db/dataquery/highdim/mirna/MirnaModule.groovy
	src/groovy/org/transmartproject/db/dataquery/highdim/protein/ProteinModule.groovy
	src/groovy/org/transmartproject/db/dataquery/highdim/rbm/RbmModule.groovy
	src/groovy/org/transmartproject/db/dataquery/highdim/rnaseqcog/RnaSeqCogDataRow.groovy
	src/groovy/org/transmartproject/db/dataquery/highdim/rnaseqcog/RnaSeqCogModule.groovy
	test/integration/org/transmartproject/db/dataquery/highdim/mirna/MirnaTestData.groovy
	test/integration/org/transmartproject/db/dataquery/highdim/rbm/RbmDataRetrievalTests.groovy
	test/integration/org/transmartproject/db/dataquery/highdim/rnaseqcog/RnaSeqCogEndToEndRetrievalTests.groovy
	test/integration/org/transmartproject/db/dataquery/highdim/rnaseqcog/RnaSeqCogTestData.groovy
Merge branch thehyve/master into highdim_for_transmart
Merge pull request #4 from thehyve/highdim_for_transmart

Sync with thehyve/master; new high dim API
Merge -s ours transmart/master into thehyve/master

This takes thehyve's master IN FULL, replacing any changes in
transmart/transmart-core-db.
Use transmartfoundation's nexus
Link to the correct travis build status image
merge hyve/master post-hackathon updates
add grailsCentral for foundation repo
Save user specified in QueryDefinition in db
Improve comments on AccessLevel
Implement access checks for new resource types
Change de_gpl_info.release_nbr to string (FT-749 + FT-751)
Merge master into permission_checks
Merge pull request #20 from j-hudecek/master

Vcf implementation, now including tests
CHERKASY-102 adding mrna data to the default TestData instance
CHERKASY-102 removing forgotten TestData singleton
Merge pull request #35 from thehyve/CHERKASY-102_implement_highdim_resource

CHERKASY-102 adding mrna data to the default TestData instance