Merge pull request #256 from FWAJL/master

Master
Issue #232

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

dev to master