Merge branch 'master' into recency

* master: (37 commits)
  indicator page header styling
  Remove href from link to stop page jumping
  provisional header fix for IE9
  ballsed up a merge
  Fix styling issus, possibly caused by merge
  cartodb indicator updates now formed by NRT-indicatorator not NRT core app
  Remove commented code
  Modal box finished needs content review
  creates correct URL to query indicatorator
  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
  fix breaking scss compile with "unquote"
  can update indicator data with cartodb feed
  added links and minor style adjustments
  generates URL to update indicators with cartodb data feed
  Adding imgs of the about page
  Fixes
  theme page includes indicator boxes
  ...

Conflicts:
	server/views/indicators/show.hbs
Merge branch 'headline-figures' into recency

* headline-figures:
  Make page reload after headline select, tweak styling
  parameter selector styling
  Show year in indicator header
  Add headline selector to draft page
  Add select headline date view
Calculate recency text from page headline
Merge pull request #138 from unepwcmc/recency

Recency
Merge branch 'master' into login-logout

* master:
  Calculate recency text from page headline

Conflicts:
	server/package.json