Merge branch 'develop' into feature/brian_workflow_2.5

Conflicts:
	decider-bwa-pancancer/workflow_decider.pl
merged in the branch brian_workflow_2.5