Metacore Enrichment support in Marker Selection module
Fixed bug in enrichment template
Enrichment fixes
Marker selection heatmap now displays gene symbols
New branch based on checking out new master into cortellis-integration-test
Doesn't work at the moment
Bugfix in Marker Selection heatmap
Merge pull request #1 from thehyve/postgresMigrate

Postgres migrate update from Kees
Fixes to allow project to compile successfully
Merge branch 'metacore-integration' into grails2x-master-mc

Conflicts:
	.classpath
	.project
	plugin.xml
Fixed bug in RModulesService that worked with new String-based PluginModule like it is a Clob
Update grails-app/conf/BuildConfig.groovy

Adding mavenRepo for ehcache-core
Update grails-app/conf/BuildConfig.groovy

Enabling mavenRepo to prevent compliation to fail.
Update grails-app/conf/BuildConfig.groovy

Revert as it causes some problems on other configuration
Changed how a module's parameters are read from the database to make it work with Postgres.
maintenance commit
Merge branch 'master' of https://github.com/transmart/Rmodules

Conflicts:
	grails-app/services/com/recomdata/transmart/data/association/RModulesService.groovy
Merge branch 'master' into grails2x-master-mc

Conflicts:
	.gitignore
	application.properties
	grails-app/services/com/recomdata/transmart/data/association/RModulesService.groovy
	grails-app/views/plugin/_markerSelection_out.gsp
	plugin.xml
	web-app/Rscripts/MarkerSelection/MarkerSelection.R
Fixed merge-induced bug
Merge pull request #3 from eugene-rakhmatulin/master

Enrichment analysis + bugfixes
Line ending changes only
Line ending changes only