Conflicts: circle/dashboard/templates/dashboard/index-groups.html circle/dashboard/tests/test_views.py circle/dashboard/views.py
