squash merge of master & prepare test

Conflicts:
	app/models/item.rb
	cider-ci/tasks/cucumber_scenarios.yml
	features/borrow/suche.feature
	features/examples/gegenstand_editieren.feature
	features/examples/inventar.feature
	features/examples/inventar_csv.feature
	features/examples/probleme.feature
	features/examples/ruestliste.feature
	features/personas/dumps/minimal_seed.sql
	features/step_definitions/examples/ausleihe_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/manage/hand_over/sign_contract_steps.rb
	features/step_definitions/manage/take_back/edit_take_back_end_date_steps.rb
	features/step_definitions/web_extra_steps.rb
	spec/controllers/hslu_ldap_controller_spec.rb
	spec/controllers/ldap_controller_spec.rb