FS#3906 UTC time for timestamp

replaced calls to GMTnow() with now()

fixed merging errors