Cherry pick Stanley's code [enable adding time for deadline task]
Cherry-pick and fixed Stanley's code [allow for events to be from date at time to time
Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch