Merge pull request #2 from thehyve/postgresMigrate

Branch integration
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