Merge pull request #75 from CTDisasterManagement/V4.7

V4.7 - Resolved Internal QA Issues
nls
fix nls
Resolved Github Issue

Resolved #76