Resolved Github Issues

Resolved #87, #104
Merge remote-tracking branch 'upstream/development' into V1.8
Merge pull request #109 from CTDisasterManagement/V1.8

V1.8- Resolved Github Issues