added support for email export
Merge branch 'refs/heads/feature-email-export' into develop
Updated time zone