Fixed time-stamping bug

Fixed bug causing app to overwrite newer device data with older server
data.