Merge remote-tracking branch 'origin/bow' into peter

Conflicts:
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/extensions/Ln.scala
	flexiprep/src/main/scala/nl/lumc/sasc/biopet/pipelines/flexiprep/Cutadapt.scala