put more food and categories in database and fixed warning page
Merge branch 'master' of https://github.com/ShelfLifeApp/ShelfLife-Android
matched food icons
Merge branch 'master' of https://github.com/ShelfLifeApp/ShelfLife-Android