Fixed for live preview overlay and API epoch numbers in seconds rather than ms
Merge branch 'master' into squares