fixed time bug
fixed cross day add event bug
Merge branch 'master' into cs147smilendar