Added conversions to local timezone based on site.
Merge branch 'pilot' into demo