Merge branch 'develop' into feature-gentrap_additions

Conflicts:
	public/gentrap/src/main/scala/nl/lumc/sasc/biopet/pipelines/gentrap/Gentrap.scala
	public/mapping/src/main/scala/nl/lumc/sasc/biopet/pipelines/mapping/Mapping.scala