Merge branch 'develop' into feature-unittest_core
Conflicts: public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala
Conflicts: public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetCommandLineFunctionTrait.scala public/biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetQScript.scala