correct foodDao
Merge branch 'develop'