Conflicts:
	setup.py
	slapos/recipe/librecipe/genericslap.py
	slapos/recipe/publish.py
	slapos/recipe/request.py
	slapos/recipe/softwaretype.py