fill database
Merge branch 'master' of https://github.com/ShelfLifeApp/ShelfLife-Android
fixed some minor bugs