squash merge master

Conflicts:
	Gemfile.lock
	app/models/item.rb
	app/views/documents/picking_list.html.haml
	cider-ci/tasks/cucumber_scenarios.yml
	features/examples/inventar.feature
	features/examples/ruestliste.feature
	features/personas/dumps/minimal_seed.sql
	features/step_definitions/examples/aushaendigung_steps.rb
	features/step_definitions/examples/gegenstand_editieren_steps.rb
	features/step_definitions/examples/gegenstand_erstellen_steps.rb
	features/step_definitions/examples/inventar_steps.rb
	features/step_definitions/languages/de_steps.rb
	features/step_definitions/web_extra_steps.rb
	spec/controllers/ldap_controller_spec.rb