fixing specs
Merge branch 'master' of https://github.com/StrataLabs/service_desk

Conflicts:
	spec/models/ability_spec.rb