设置日历提醒
增加侧边栏打开的按钮
 Merge branch 'nick' into 'master'

Nick