Merge branch 'master' into fix-personal-snippet-access-workflow

CHANGELOG

Gemfile

Gemfile.lock

PROCESS.md

app/assets/images/auth_buttons/facebook_64.png

app/assets/javascripts/calendar.js.coffee

app/assets/stylesheets/framework/blocks.scss

app/assets/stylesheets/framework/common.scss

app/assets/stylesheets/framework/markdown_area.scss

app/assets/stylesheets/framework/mixins.scss

app/assets/stylesheets/framework/sidebar.scss

app/assets/stylesheets/pages/diff.scss

app/assets/stylesheets/pages/events.scss

app/assets/stylesheets/pages/merge_requests.scss

app/assets/stylesheets/pages/note_form.scss

app/assets/stylesheets/pages/profile.scss

app/assets/stylesheets/pages/projects.scss

app/assets/stylesheets/pages/sherlock.scss

app/controllers/admin/application_settings_controller.rb

app/controllers/application_controller.rb