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
Merge branch 'master' into testmerge

Conflicts:
	grails-app/conf/BuildConfig.groovy