Added 30 seconds to server delay fix
Merge branch 'dev' into beta
Merge branch 'beta'