Merge remote-tracking branch 'remotes/origin/develop' into fix-BIOPET-669
# Conflicts: # biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/report/ReportBuilder.scala # flexiprep/src/main/resources/nl/lumc/sasc/biopet/pipelines/flexiprep/flexiprepBaseSummary.ssp # flexiprep/src/main/resources/nl/lumc/sasc/biopet/pipelines/flexiprep/flexiprepReadSummary.ssp # gears/src/main/scala/nl/lumc/sasc/biopet/pipelines/gears/GearsReport.scala