Merge pull request #246 from CTDisasterManagement/V5.1

V5.1- Resolved Github Issue
#245
#245
#244
Resolved Github Issue

Resolved #247