FS#3906 UTC time for timestamp

replaced calls to GMTnow() with now()

fixed merging errors
FS#3946 time zone for agent

added code to display time at the timezone set for agent
when in chat window
Merge branch 'release-3.8.0-with-UTC-and-TZ'