ARTEMIS-8027 - working in dashboard3 branch
Merge pull request #1 from brettcave/dashboard3

ARTEMIS-8027 - working in dashboard3 branch