merged and fixed master
merged master in
merge conflict in ab.js
add mediator to ab.js
Enhanced email signups to add on-signed in version and local storage checking
Merge branch 'master' of https://github.com/guardian/frontend into id-email-signups-ab

* 'master' of https://github.com/guardian/frontend: (77 commits)
  single file compilation
  Apply the correct meta to star rating
  Apply auto link tags only to full words
  add basic facia feature test
  reverting
  fix rebase
  use the hashed facia js; better compiliation of facia - dont copy over all files to static target
  pull in xcvbn file
  Fix related container alignment
  Added hack to get the word count when it's not set correctly
  Reseting the inline ad count when the ads are destroyed
  comment fix
  Refactor value
  Fix double display property
  Align 2 items horizontally only if viewport is greater than 320px
  AWS permissions have been tweaked.
  decrease opt-in percentage to 5
  adding uk survey
  Remove unnecessary font size declaration - thx @ironsidevsquincy
  Updated signin script to take out the console.log
  ...

Conflicts:
	article/app/views/fragments/articleBody.scala.html
	common/app/assets/javascripts/modules/experiments/tests/identity-email-signup.js
	common/app/assets/javascripts/modules/identity/email-signup.js
	common/app/assets/stylesheets/module/_article.scss
	common/app/conf/switches.scala
removed broken test
fixed merge conflict
Merge remote-tracking branch 'origin/master' into gravity-populate-righthand-component
Merge branch 'master' of https://github.com/guardian/frontend into id-email-signups-ab

* 'master' of https://github.com/guardian/frontend: (191 commits)
  Fix spacing in fromage
  Remove tonal fragments from features container
  Fix fronts
  Loop through feature items with the new method
  Don't call CSS from local storage when in dev
  Bottom row of features uses normal cards
  Revert "Merge pull request #2910 from guardian/account-verification"
  fixing test
  New features container
  Change form-field--email-validation to BEM modifier & overqualify selector to ensure it overrides _forms.scss
  Added IdentityEmailVerificationSwitch to control display of resend email button
  Added the ID client token header to the validate-email Api call.
  Script now works with James G's endpoint and Nicks additions
  Updated the resend validation email URL.
  UI for Email validation on Profile page & Completion
  Stubbed out verify-email page.
  indentation
  focus as well as hover
  Made some decisions about stuff..
  added myself to humans.txt
  ...
Adding some humans
Update humans.txt

Adding me!
Update humans.txt
add me
implement gravity tracking
merged from origin/master
Update humans.txt
Update humans.txt
Adding myself to humans.txt
Update humans.txt