:fish:, for controllers
:fish:, for domain models
:fish:, for services
:fish:, for conf, jobs, taglib
:fire:, removes empty test files
:fish:, for test
:fish:, replaces CRLF with LF in grails-app
Adds a .gitattributes file (work with git version > 1.7).
This tells git when to convert CRLF line endings to LF line endings.
:fire:, removes unused imports, reorders imports, be specific with imports (ran with IntelliJ "OPtimize Imports" func)
Correct bug for searching levels below study
removes seemingly random testme file
:fish:, replaces CRLF with LF in test
Correct wrong merge with dev branch
ws
Merge pull request #8 (thehyve) into rc2_dev

Conflicts:
	grails-app/services/SearchKeywordService.groovy
Fix line-endings on files missed before

Conflicts:
	web-app/js/datasetExplorer/workflowStatus.js
	web-app/panels/compareStepPathwaySelection.html
Merge branch 'pull_req_10' into rc2_dev

Conflicts:
	grails-app/controllers/fm/FmFolderController.groovy
	web-app/js/datasetExplorer/datasetExplorer.js
Reformat datasetExplorer.js
Merge branch 'rc2_dev' into implements_sane_heatmap

Conflicts:
	grails-app/services/com/recomdata/transmart/data/export/DataExportService.groovy
	grails-app/services/com/recomdata/transmart/data/export/GeneExpressionDataService.groovy
	src/java/com/recomdata/transmart/data/export/util/FileWriterUtil.java
	web-app/js/datasetExplorer/workflowStatus.js