Merge remote-tracking branch 'origin/develop' into feature-report

.../scala/nl/lumc/sasc/biopet/pipelines/gatk/ShivaTest.scala

.../sasc/biopet/pipelines/gatk/ShivaVariantcallingTest.scala

...umc/sasc/biopet/pipelines/bammetrics/BamMetricsTest.scala

...t/scala/nl/lumc/sasc/biopet/pipelines/carp/CarpTest.scala

.../lumc/sasc/biopet/pipelines/flexiprep/FlexiprepTest.scala

...cala/nl/lumc/sasc/biopet/pipelines/gears/GearsTrait.scala

...a/nl/lumc/sasc/biopet/pipelines/gentrap/GentrapTest.scala

...a/nl/lumc/sasc/biopet/pipelines/mapping/MappingTest.scala

...scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaTest.scala

...sasc/biopet/pipelines/shiva/ShivaVariantcallingTest.scala