Merge branch 'master' of github.com:USGS-CIDA/glri-afinch
Resolved IE cross-origin canvas content security exception by proxying all base layers and wms requests.
Merge branch 'master' of github.com:USGS-CIDA/glri-afinch
Merge branch 'ieCanvasSecurityFix'
fixed broken base layer
Revert "Resolved IE cross-origin canvas content security exception by proxying all base layers and wms requests."

This reverts commit 876e91277c418416d56dc08e60b21302c95b05ad.

Conflicts:
	glri-afinch-web/src/main/webapp/js/Map/map.js
fixed broken base layer
Merge pull request #38 from cschroed-usgs/fixBrokenBaseLayer

Fix broken base layer