merging
Merge branch 'master' of https://github.com/MarkVSullivan/SobekCM-Web-Application

Conflicts:
	SobekCM_Library/AdminViewer/Builder_Admin_MySobekViewer.cs
MapEdit Work

-minor cleanup