Conflicts:
	biopet-framework/BiopetFramework.iml
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/core/BiopetExecutable.scala
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/BedToInterval.scala
	biopet-framework/src/main/scala/nl/lumc/sasc/biopet/tools/WipeReads.scala