edit activity layout
Merge branch 'master' of https://github.com/ShelfLifeApp/ShelfLife-Android