added function to fetch user avatar for a single element
added avatar and cancel button to main reply box
Merge branch 'master' of github.com:guardian/frontend into discussion-reply-avatar

* 'master' of github.com:guardian/frontend: (27 commits)
  Oops, really need to check the right thing...
  Change Content API url.
  Scala tests browser understands the selectors
  Fix a bug in firefox
  Small styling changes to comment sorting
  return replace domain
  CSS comment does not exceed the 80 char line limit
  fix switch checking
  Do not auto link to section tags
  Comment order element doesn't zoom
  Update _discussion.scss
  Use monocolumn wrapper on Ethical awards forms
  Numerous tweaks. Such styling. Much viewports. Wow.
  Truncate Masterclass description to 250 chars.
  text from theresa
  Update link to monitoring in CONTRIBUTING doc.
  Fix argument number in thumbnail item fragment
  Formstack styles for date and time
  Formstack styles for radio buttons
  Design tweaks to top stories and introduce support / image tone classes
  ...
added reply author and reply parent quote to reply comment box
adding comment blockquotes style
simplifying blockquote quick fix here
css selector readibility
avatar image alt attribute
spout positioning fix
Merge branch 'master' of github.com:guardian/frontend into discussion-reply-avatar

* 'master' of github.com:guardian/frontend: (158 commits)
  Group Quantcast switch under commercial tags
  Fix broken switch signature
  Change css class to be content agnostic
  Prevent right most popular from overlapping footer
  DELETE ALL THE THINGZZZ
  Use Pngcrush to make ECOVER banner filesize 24% smaller
  Close IMG tag
  Ethical awards banner
  uneditable property added to config
  Merge underlined links in to full production
  But right hand most popular behind feature switch
  Move right hand most popular out of experiments folder
  Add switchboard plugin to Diagnostics
  Remove old right hand popular ab test
  Corrected Masterclass component typo
  Remove tonal colouring from share this heading
  Tweak styling og right most popular title
  Remove elipsis from right hand most popular title
  Add correct image upgrade class to right hand items
  Tweak padding around right hand mpu to align with main image
  ...

Conflicts:
	common/app/assets/javascripts/modules/discussion/comment-box.js
	common/app/assets/stylesheets/module/_discussion.scss
	discussion/app/views/fragments/commentBox.scala.html
Merge pull request #2755 from guardian/discussion-reply-avatar

Discussion reply avatar