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
Correct typo
Correct typo
Correct typo
Change button to label for consistency
Change button to label for consistency
Change button to label for consistency
Dropdown  goes to same action of different inventory pool
Add direct link to other pool's inventory
Add routes for backend search
Correct container title
Use default english "all".
Run both headless kinds of tests in sequence on Travis.
Fix HAML syntax error (indentation).
Fix duplicate routes.
conflict resolution