Added time_zone to User
Merge branch 'master' into time_zone
Now displaying times throughout site according to cas_user.time_zone