Added users to dashboards
Fixed merge conflicts
Merged dashboard-user relationship and fixed conflicts