Issue #339

see issue for details
Merge branch 'feature_housekeeping' of https://github.com/FWAJL/FieldWorkAssistantMVC into feature_housekeeping