MAP-5:  Improvements to RTF tinymce editor display
MAP-409:  Terminology browser auto-expansion on search.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	webapp/src/main/webapp/js/widgets/mapRecord/mapRecord.js