squash merge of upcoming branch

Conflicts:
	features/examples/inventar.feature
	features/examples/inventar_csv.feature
	features/step_definitions/examples/gegenstand_editieren_steps.rb
	features/step_definitions/examples/gegenstand_erstellen_steps.rb
[FIX CI] software_loeschen.feature
fix retired param in hand over ajax call
fix indentation