Fixes to conflict resolution, some changes to terminology browser
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop