try to add a calendar dor displaying diaries
tmp
finish view diaries in two modes
Merge remote-tracking branch 'origin/linzy'
Merge remote-tracking branch 'origin/linzy'

Conflicts:
	MainActivity/src/edu/ntu/arbor/sbchao/androidlogger/MainDashboardActivity.java