timestamps for terrestrial models
fixing some conflicts
Merge branch 'sprint6' into tom
some timestamp collisions