updated tests and fixed error view on LunchActivity
Merge branch 'develop' into robin