Merge commit 'cfae9015'

Conflicts:
	flexiprep/nbactions.xml
	gatk/gatk-pipeline/src/main/scala/nl/lumc/sasc/biopet/pipelines/gatk/GatkPipeline.scala
	gatk/gatk-variantcalling/src/main/scala/nl/lumc/sasc/biopet/pipelines/gatk/GatkVariantcalling.scala
	mapping/examples/test.json
	mapping/nbactions.xml
	pom.xml