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

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/application.js.coffee

app/assets/javascripts/u2f/authenticate.js.coffee

app/assets/javascripts/u2f/error.js.coffee

app/assets/javascripts/u2f/register.js.coffee

app/assets/javascripts/u2f/util.js.coffee.erb

app/controllers/application_controller.rb

app/controllers/concerns/authenticates_with_two_factor.rb

app/controllers/profiles/two_factor_auths_controller.rb

app/controllers/sessions_controller.rb

app/helpers/auth_helper.rb

app/models/u2f_registration.rb

app/models/user.rb

app/views/devise/sessions/two_factor.html.haml

app/views/help/_shortcuts.html.haml

app/views/layouts/_head.html.haml

app/views/layouts/application.html.haml

app/views/layouts/devise.html.haml