CE upstream: Friday
CONFLICT (content): Merge conflict in app/views/layouts/nav/_new_admin_sidebar.html.haml
CONFLICT (content): Merge conflict in app/assets/stylesheets/pages/projects.scss
CONFLICT (content): Merge conflict in app/views/layouts/nav/_new_admin_sidebar.html.haml
CONFLICT (content): Merge conflict in app/assets/stylesheets/pages/projects.scss