Merge branch 'hotfix/bwa-mem-M'
Merge branch 'develop'
Merge branch 'develop'
Add variable to picard-settings