passed all activities into dashboard route
pulling in master
Merge branch 'master' into front-end