Changed datetime.now to timezone.now (from django utils)
Merge branch 'master' of https://github.com/kurigohan/ems_site