Added 2nd line on food item row. Added UnitText in db.
Renamed some fields and added mUnitText to FoodItem.