Merge branch 'add-irker-service' of https://github.com/Aorimn/gitlabhq into Aorimn-add-irker-service

Conflicts:
	app/controllers/projects/services_controller.rb