Set timezone to start and end date of an event
Merge remote-tracking branch 'origin/master'