Conflicts:
	public/biopet-public-package/pom.xml
	public/biopet-public-package/src/main/scala/nl/lumc/sasc/biopet/core/BiopetExecutablePublic.scala