SPDIII-91 Discrepancy report bug: Save ticket after activity gets saved to update in solr
Merge branch 'master' of github.com:StrataLabs/service_desk

Conflicts:
	spec/models/ticket_spec.rb