Merge pull request #47 from CTDisasterManagement/V3.6

V3.6- Resolved Github Issue
Merge remote-tracking branch 'upstream/development' into V3.8
V3.8- Resolved Internal QA issues