made feature tests pass and changed a view on the restaurant
Merge branch 'master' into tests
Skip old, incompatible cart tests.
Merge pull request #53 from QuillyT/tests

Tests