refactor controller and state names on dashboard client
fix merge conflict
Merge branch 'master' of github.com:NixieAgency/edac