merge branch fs_cucumber_browser

Conflicts:
	cider-ci/tasks/cucumber.yml
	cider-ci/tasks/cucumber_scenarios.yml
	cider-ci/tasks/cucumber_strict.yml
	features/examples/aushaendigung.feature
	features/examples/ruestliste.feature
	features/personas/dumps/minimal_seed.sql
	features/support/env_screenshots.rb