Merge pull request #328 from CTDisasterManagement/V7.6

V7.6-Resolved Github Issues
Merge pull request #329 from CTDisasterManagement/V7.7

V7.7-Resolved Github Issues
Resolved Github Issues

Resolved #313
Code review implementation