Resolved Github Issue

Resolved #120
Merge pull request #125 from CTDisasterManagement/V2.2

V2.2- Resolved Github Issue
Merge pull request #128 from Esri/development

Merging pull requests from dev branch to master.