Merge pull request #330 from CTDisasterManagement/V7.8

V7.8-Resolved Github Issues
textarea
Resolved Github Issues

Resolved #307, #324