Merge remote-tracking branch 'origin/develop' into fix-BIOPET-306-2
# Conflicts: # biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/rscript/LinePlot.scala # shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaReport.scala
Showing
# Conflicts: # biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/rscript/LinePlot.scala # shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaReport.scala