Fixed station and time refresh, combined
Merge branch 'dev' into beta
Cache busted scripts.js
Merge branch 'dev' into beta
Merge branch 'beta'