Fixed time function. We need to download pytz module on GAE.
Merge remote-tracking branch 'origin/master'