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
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
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 #2 from thehyve/postgresMigrate

Branch integration
Merge pull request #3 from eugene-rakhmatulin/master

Enrichment analysis + bugfixes
Line ending changes only
Line ending changes only
Merge branch 'master' into postgresMigrate

Conflicts resolved:
	grails-app/services/com/recomdata/transmart/data/association/RModulesService.groovy
	grails-app/views/plugin/_markerSelection_out.gsp
	web-app/Rscripts/MarkerSelection/MarkerSelection.R
removing .settings (Eclipse dir)
added IntelliJ files to .gitignore
upgrade to Grails 2.1.1, add resources plugin as dependency