• bow's avatar
    Merge branch 'develop' into feature-gentrap · f1441306
    bow authored
    Conflicts:
    	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Tophat.scala
    	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectAlignmentSummaryMetrics.scala
    	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/CollectInsertSizeMetrics.scala
    	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/MarkDuplicates.scala
    	public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/picard/Picard.scala
    f1441306