Removed unused files
Merge branch 'master' into staging
Removed timeline workaround
Merge pull request #767 from UM-USElab/dashboard-update

Removed timeline workaround
Merge branch 'staging' of github.com:UM-USElab/gradecraft-development into staging
Merge branch 'master' into staging