CLEANUP: fix index-dev.html and index.html; fix conflict resolution dashboard.
Merge branch 'master' of https://github.com/WestCoastInformatics/OTF-Mapping-Service

Conflicts:
	webapp/src/main/webapp/app/index.html