Fixed station and time refresh, combined
Merge branch 'dev' into beta