JR & LK - test that login directs to dashboard
JR & LK - update dashboard icon
merge upstream commits
Merge pull request #155 from Loos/master

Update dashboard icon