Adding dashboard widget, fixing bugs
Merge branch 'feature-dashboardwidget'
Making sure versions match
Merge branch 'feature-dashboardwidget'