Merge remote-tracking branch 'remotes/origin/develop' into fix-BIOPET-417
# Conflicts: # biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/package.scala
File moved
# Conflicts: # biopet-utils/src/main/scala/nl/lumc/sasc/biopet/utils/package.scala