Major work on the Management Dashboard
Merge branch 'master' of https://github.com/vpalodic/rinkfinder

Merge