fixed timestamp inconsistencies server side
Merge branch 'dev'