MAP-346: Decide error display behavior in the user interface.
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	webapp/src/main/webapp/js/controllers.js
	webapp/src/main/webapp/partials/login.html
Merge branch 'develop' of https://github.com/WestCoastInformatics/OTF-Mapping-Service into develop

Conflicts:
	webapp/src/main/webapp/js/controllers.js