CE upstream
Unmerged paths: (use "git add ..." to mark resolution)
both modified: app/views/layouts/nav/_admin.html.haml
both modified: app/views/layouts/nav/_group_settings.html.haml
both modified: doc/README.md
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Unmerged paths: (use "git add ..." to mark resolution)
both modified: app/views/layouts/nav/_admin.html.haml
both modified: app/views/layouts/nav/_group_settings.html.haml
both modified: doc/README.md