add today dairy
Merge branch 'dairy-20140421'