UHM-1144: Figure out a proper way to handle timezone issues
Reverted our hacky workaround until we come up a better solution
UHM-1144: Figure out a proper way to handle timezone issues
Display a warning if the user is in a different time zone than server
Merge remote-tracking branch 'origin/master'