Merge branch 'master' of github.com:gitlabhq/gitlabhq

CHANGELOG

VERSION

app/controllers/admin/hooks_controller.rb

app/controllers/projects/services_controller.rb

app/models/hooks/web_hook.rb

app/models/project.rb

app/models/project_services/hipchat_service.rb

app/services/system_hooks_service.rb

app/services/test_hook_service.rb

app/workers/project_web_hook_worker.rb

app/workers/system_hook_worker.rb

doc/integration/gitlab_buttons_in_gmail.md

lib/api/system_hooks.rb

lib/gitlab/contributions_calendar.rb

lib/tasks/gitlab/check.rake

spec/models/hooks/web_hook_spec.rb

spec/models/project_services/hipchat_service_spec.rb