MAP-38:  Reenabled flags
MAP-864:  Legend fix for new editing selected color
MAP-857:  More cleanup on project switching
MAP-853:  Major changes to reporting infrastructure
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	admin/loader/pom.xml
MAP-853:  Mojos and items for reports