Merge branch 'master' into adding_crime_security

CHANGELOG

CONTRIBUTING.md

Gemfile

Gemfile.lock

VERSION

app/assets/images/emoji.png

app/assets/javascripts/application.js.coffee

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/notes.js.coffee

app/assets/javascripts/project.js.coffee

app/assets/javascripts/projects_list.js.coffee

app/assets/javascripts/star.js.coffee

app/assets/stylesheets/application.scss

app/assets/stylesheets/framework/blocks.scss

app/assets/stylesheets/framework/buttons.scss

app/assets/stylesheets/framework/common.scss