Merge branch 'master' of gitlab.com:gitlab-org/gitlab-ce into fix/project-import_url

CHANGELOG

Gemfile.lock

app/assets/javascripts/application.js.coffee

app/assets/javascripts/awards_handler.coffee

...assets/javascripts/stat_graph_contributors_util.js.coffee

app/assets/stylesheets/framework/blocks.scss

app/assets/stylesheets/framework/dropdowns.scss

app/assets/stylesheets/framework/gitlab-theme.scss

app/assets/stylesheets/framework/layout.scss

app/assets/stylesheets/framework/mixins.scss

app/assets/stylesheets/framework/typography.scss

app/assets/stylesheets/pages/admin.scss

app/assets/stylesheets/pages/diff.scss

app/assets/stylesheets/pages/issuable.scss

app/assets/stylesheets/pages/login.scss

app/assets/stylesheets/pages/profile.scss

app/assets/stylesheets/pages/projects.scss

app/assets/stylesheets/pages/stat_graph.scss

app/assets/stylesheets/pages/xterm.scss

app/controllers/admin/application_settings_controller.rb