add today dairy
add dairy
add dairy
Merge branch 'dairy-20140410'