Color change to Not-A-Conflict button
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop