Merge branch 'master' into fixes/api

.travis.yml

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/merge_requests.js.coffee

app/assets/stylesheets/gitlab_bootstrap/mixins.scss

app/assets/stylesheets/sections/header.scss

app/contexts/merge_requests_load_context.rb

app/contexts/test_hook_context.rb

app/controllers/merge_requests_controller.rb

app/controllers/profiles_controller.rb

app/helpers/application_helper.rb

app/helpers/commits_helper.rb

app/models/key.rb

app/models/merge_request.rb

app/models/project.rb

app/models/project_team.rb

app/models/system_hook.rb

app/models/user.rb

app/models/web_hook.rb