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

.gitignore

CHANGELOG

app/assets/javascripts/dispatcher.js.coffee

app/assets/stylesheets/generic/typography.scss

app/controllers/admin/application_controller.rb

app/controllers/application_controller.rb

app/controllers/dashboard/application_controller.rb

app/controllers/dashboard/groups_controller.rb

app/controllers/dashboard/milestones_controller.rb

app/controllers/dashboard/projects_controller.rb

app/controllers/dashboard_controller.rb

app/controllers/explore/application_controller.rb

app/controllers/explore/groups_controller.rb

app/controllers/explore/projects_controller.rb

app/controllers/groups/application_controller.rb

app/controllers/groups/avatars_controller.rb

app/controllers/groups/group_members_controller.rb

app/controllers/groups/milestones_controller.rb

app/controllers/groups_controller.rb

app/controllers/help_controller.rb