Map Search Work

-Changed search code
Merge branch 'master' of https://github.com/MarkVSullivan/SobekCM-Web-Application
Map Work

-various changes