Fixed conflict in new dashboard
Merge branch 'master' into frontend-alex

Merging for overall stability
Fixed join to -maybe- work
Switched to test keys
Fixed stupid one line merge conflict