timezone to EST
timezone to EST
Merge branch 'master' into authenticate
updated for devise compiling