CE upstream: Friday
Conflicts:
both modified: app/assets/javascripts/dispatcher.js
both modified: app/assets/stylesheets/pages/projects.scss
both modified: config/webpack.config.js
Do not update/delete: Banner broadcast message test data
Do not update/delete: Notification broadcast message test data
Conflicts:
both modified: app/assets/javascripts/dispatcher.js
both modified: app/assets/stylesheets/pages/projects.scss
both modified: config/webpack.config.js