Merge branch 'develop' into feature-unittest_core
Conflicts: protected/biopet-gatk-pipelines/src/main/scala/nl/lumc/sasc/biopet/pipelines/gatk/GatkVariantcalling.scala public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/igvtools/IGVToolsCount.scala public/mapping/pom.xml
public/bam2wig/Bam2Wig.iml
0 → 100644
public/bam2wig/pom.xml
0 → 100644