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