Deleting that stupid file.
fixing test, reducing results from 10 to 5
Merged conflicts after stash pop.
New translations for helper screen.
Merge branch 'next' into mk_rspec_to_cucumber