updated Dairy DAO objects with all the columns
made fields upper case
fixed dairies table script
dairies table changes
merge dairies table