add today dairy
add today dairy
Merge branch 'dairy-20140409'