Merge branch 'master' into milestone-ref

CHANGELOG

app/assets/javascripts/awards_handler.coffee

app/assets/javascripts/blob/blob_file_dropzone.js.coffee

app/assets/javascripts/merge_request_widget.js.coffee

app/assets/javascripts/new_branch_form.js.coffee

app/assets/javascripts/new_commit_form.js.coffee

app/assets/javascripts/project.js.coffee

app/assets/javascripts/star.js.coffee

app/assets/stylesheets/pages/awards.scss

app/assets/stylesheets/pages/emojis.scss

app/assets/stylesheets/pages/projects.scss

app/controllers/concerns/creates_commit.rb

app/controllers/concerns/creates_merge_request_for_commit.rb

app/controllers/projects/blob_controller.rb

app/controllers/projects/forks_controller.rb

app/controllers/projects/imports_controller.rb

app/controllers/projects/tree_controller.rb

app/controllers/projects_controller.rb

app/helpers/blob_helper.rb

app/helpers/tree_helper.rb