Merge branch 'master' of github.com:USGS-CIDA/glri-afinch
popup added. closes after 2 sec.
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
Merge pull request #35 from tkunicki-usgs/master

removed META-INF/context.xml from repository and added to .gitignore
Made changes suggested on trello card #32. Moved popoup invocation to the map panel's afterrender. Added white background version of image.
Implemented conditional proxying for IE9
Made /all/ attribution popup links open in a new tab
fixed broken base layer
added axis labels
changing proxy activation from IE9 to all IE versions
switched from evil inline styling to proper CSS classes
Change buttons into a drop-down menu with check boxes
change hover to display only month year (e.g. Mar. 2007, rather than 2007/03/01)
Do not display empty period of record (in montly flow data) at the beginning of the reach record if it exists
Merge pull request #38 from cschroed-usgs/fixBrokenBaseLayer

Fix broken base layer
Merge pull request #37 from cschroed-usgs/attribInitialPopup

Attrib initial popup