Merge pull request #338 from FWAJL/dev

Merge pull request #335 from FWAJL/feature_housekeeping
Issue #339

see issue for details
Merge branch 'feature_housekeeping' of https://github.com/FWAJL/FieldWorkAssistantMVC into feature_housekeeping
Merge pull request #340 from FWAJL/feature_housekeeping

feature to dev
Merge pull request #341 from FWAJL/dev

dev to feature