Conflicts:

- app/views/admin/dashboard/index.html.haml
- app/views/layouts/nav/_project_settings.html.haml
- app/views/shared/members/_member.html.haml