Merge branch 'develop' of https://github.com/SciLifeLab/scilifelab into develop
Merge branch 'develop' of https://github.com/SciLifeLab/scilifelab into develop
Merge branch 'develop' of https://github.com/SciLifeLab/scilifelab into develop
Merge branch 'develop' of https://github.com/SciLifeLab/scilifelab into develop
Merge branch 'develop' of https://github.com/SciLifeLab/scilifelab into develop
Merge branch 'develop' of https://github.com/SciLifeLab/scilifelab into develop
Merge branch 'develop' of https://github.com/SciLifeLab/scilifelab into develop
Merge branch 'develop' of https://github.com/mayabrandi/scilifelab into develop
Fix conflict
Merge branch 'develop' of https://github.com/mayabrandi/scilifelab into develop
Maya conflict
Merge pull request #201 from brainstorm/master

Weekly develop-->master merge
-
Merge pull request #202 from mayabrandi/develop

minor chanages
fixed indentation, genome build is not modified if application is unknown
fixed error in passing parameters
Merge pull request #203 from b97pla/hotfix/fix_indentation

HOTFIX: fix indentation error
corrected trim() call, removed misplaced lower() call
Adjusted for config file in funk_001. This verssion works from funk_001
Merge pull request #204 from mayabrandi/develop

Adjusted for config file in funk_001. This verssion works from funk_001