V3.2- Resolved Github Issues

Resolved #187
Merge remote-tracking branch 'upstream/development' into V3.3
Resolved Github Issue

Resolved #193
V3.4- Resolved Github Issue

Resolved #181
Merge pull request #196 from CTDisasterManagement/V3.4

V3.4- Resolved Github Issue