Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce

CHANGELOG

Gemfile

Gemfile.lock

app/assets/stylesheets/generic/gfm.scss

app/controllers/admin/users_controller.rb

app/controllers/oauth/authorized_applications_controller.rb

app/controllers/profiles_controller.rb

app/models/event.rb

app/views/admin/deploy_keys/index.html.haml

app/views/admin/users/index.html.haml

app/views/admin/users/show.html.haml

...doorkeeper/authorized_applications/_delete_form.html.haml

app/views/profiles/applications.html.haml

config/routes.rb

doc/integration/saml.md

spec/controllers/admin/users_controller_spec.rb