Merge branch 'master' of https://gitlab.com/gitlab-org/gitlab-ce into auto-fsck

CHANGELOG

Gemfile

Gemfile.lock

app/assets/javascripts/application.js.coffee

app/assets/javascripts/behaviors/quick_submit.js.coffee

app/assets/javascripts/gl_dropdown.js.coffee

app/assets/javascripts/labels_select.js.coffee

app/assets/javascripts/lib/datetime_utility.js.coffee

app/assets/javascripts/lib/notify.js.coffee

app/assets/javascripts/merge_request_tabs.js.coffee

app/assets/javascripts/merge_request_widget.js.coffee

app/assets/javascripts/notes.js.coffee

app/assets/javascripts/profile.js.coffee

app/assets/javascripts/project.js.coffee

app/assets/javascripts/project_select.js.coffee

app/assets/javascripts/todos.js.coffee

app/assets/stylesheets/framework/header.scss

app/assets/stylesheets/framework/nav.scss

app/assets/stylesheets/framework/tw_bootstrap.scss

app/assets/stylesheets/framework/variables.scss