added alert for cancel and kMinutesAhead for time
Merge branch 'merging' into Dev3