Merge branch 'master' into zj/gitlab-ce-merge-if-green

CHANGELOG

Gemfile

Gemfile.lock

README.md

app/assets/javascripts/awards_handler.coffee

app/assets/javascripts/flash.js.coffee

app/assets/javascripts/notes.js.coffee

app/assets/stylesheets/framework/flash.scss

app/assets/stylesheets/framework/markdown_area.scss

app/controllers/concerns/global_milestones.rb

app/controllers/groups/milestones_controller.rb

app/controllers/projects/hooks_controller.rb

app/controllers/projects/notes_controller.rb

app/finders/milestones_finder.rb

app/helpers/application_helper.rb

app/helpers/milestones_helper.rb

app/models/application_setting.rb

app/models/broadcast_message.rb

app/models/ci/web_hook.rb

app/models/commit.rb