Merge remote-tracking branch 'remotes/origin/develop' into fix-BIOPET-639
# Conflicts: # biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/report/ReportBuilder.scala
# Conflicts: # biopet-core/src/main/scala/nl/lumc/sasc/biopet/core/report/ReportBuilder.scala