Merge branch 'beta' into dev
Station now auto-refreshes times every 30 seconds
Merge branch 'dev' into beta