Unresolved conflicts:
- app/assets/stylesheets/pages/projects.scss
- app/views/admin/users/index.html.haml
- app/views/projects/_home_panel.html.haml
- app/views/projects/branches/_branch.html.haml
- app/views/projects/project_members/index.html.haml
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Unresolved conflicts: