refactored type of indicator feed from 'environmental' to 'esri'
generates URL to update indicators with cartodb data feed
can update indicator data with cartodb feed
Merge branch 'master' into blue-carbon-data-feed
Merge branch 'master' into blue-carbon-data-feed
fix breaking scss compile with "unquote"
creates correct URL to query indicatorator
cartodb indicator updates now formed by NRT-indicatorator not NRT core app
ballsed up a merge
Merge branch 'master' into blue-carbon-data-feed

* master:
  Fix styling issus, possibly caused by merge
  Remove commented code
  Modal box finished needs content review
  sign out on hover ready
  Remove IE sass gradient fix as it breaks everything and doesn't fix anything
  Fix unparseable sass filter
  branch for including logout on hover
  added links and minor style adjustments
  Adding imgs of the about page
  Fixes
  theme page includes indicator boxes
  about page further styling, tweaking padding and line-height
  Fixes
  about page layout & styling
  Modal box
  Theme index metadata cleanup
  Modal box

Conflicts:
	client/src/sass/main.scss
Remove href from link to stop page jumping
Merge pull request #127 from unepwcmc/blue-carbon-data-feed

Blue carbon data feed AND possibly ALL CARTODB feeds EVER
Merge branch 'master' into theme-externalid-refactor

* master:
  Remove href from link to stop page jumping
  ballsed up a merge
  cartodb indicator updates now formed by NRT-indicatorator not NRT core app
  creates correct URL to query indicatorator
  fix breaking scss compile with "unquote"
  can update indicator data with cartodb feed
  generates URL to update indicators with cartodb data feed
  refactored type of indicator feed from 'environmental' to 'esri'

Conflicts:
	server/lib/seed_indicators.json