focus for the new activities
had derped out with the escape
fix events and consider end time as now only if it's current day of the task happened no longer than 12 hours ago
Merge remote-tracking branch 'remotes/upstream/master'