merge part of fix_3_trials

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