Merge remote-tracking branch 'remotes/origin/develop' into fix-shiva_fails
Conflicts: public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaReport.scala
Conflicts: public/shiva/src/main/scala/nl/lumc/sasc/biopet/pipelines/shiva/ShivaReport.scala