Merge branch 'master' of https://dev.gitlab.org/gitlab/gitlabhq

CHANGELOG

app/assets/javascripts/importer_status.js

app/controllers/concerns/service_params.rb

app/controllers/import/base_controller.rb

app/controllers/import/bitbucket_controller.rb

app/controllers/import/github_controller.rb

app/controllers/import/gitlab_controller.rb

app/controllers/projects/hooks_controller.rb

app/helpers/import_helper.rb

app/helpers/services_helper.rb

app/models/hooks/project_hook.rb

app/models/hooks/web_hook.rb

app/models/project_services/hipchat_service.rb

app/models/project_services/slack_service.rb

app/models/service.rb

app/services/issues/base_service.rb

app/views/import/base/create.js.haml

app/views/import/base/unauthorized.js.haml

app/views/import/bitbucket/deploy_key.js.haml

app/views/import/bitbucket/status.html.haml