Merge pull request #220 from FWAJL/dev

dev to master
Merge pull request #223 from FWAJL/dev

dev to master
Merge pull request #228 from FWAJL/dev

Issue #216
Merge pull request #229 from FWAJL/dev

Issue #216
Merge pull request #234 from FWAJL/dev

dev to master
Merge pull request #238 from FWAJL/dev

dev to master
Merge pull request #241 from FWAJL/dev

Issue #240
Merge pull request #243 from FWAJL/dev

dev to master
Merge pull request #247 from FWAJL/dev

No Issue Identified
Issue #232

- Move project locations to task locations

- Remove task locations
Merge branch 'dev'
Merge pull request #256 from FWAJL/master

Master
Issue #232

Deactivating a location deletes the related task location if it exists
Merge pull request #259 from FWAJL/dev

feature_service_providers to dev