added edit/add my food functionality, changed database to include state and name for myfood
Merge branch 'master' of https://github.com/ShelfLifeApp/ShelfLife-Android