changes and todos after meeting with Erik
Merge branch 'master' into unstable
solve failing unit and functional tests
add route tests
add capybara DSL for integration tests
fix integration test for the index page