add diary of the morning
add diary of afternoon
Merge branch 'dairy-20140408'