Merge remote-tracking branch 'remotes/origin/develop' into feature-VarscanIntoShiva
Conflicts: public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/varscan/Varscan.scala
Conflicts: public/biopet-extensions/src/main/scala/nl/lumc/sasc/biopet/extensions/varscan/Varscan.scala