Merge pull request #102 from JustinRParker/dashboard

Dashboard
Merge pull request #104 from JustinRParker/dashboard

Dashboard
Merge remote-tracking branch 'upstream/dashboard' into dashboard