Working on correcting edi queue cancels.
Addressing cancels.
Merge branch 'release-1.1' into development

Conflicts:
	app/models/policy.rb