Added error message and styling for invalid emails
Comment error styling
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
fixing reply button click boundaries
hide showhiddencomments button when changing sort order
better use of space in the message module
adding comment blockquotes style
Added email verification to ID API
Merge branch 'master' of https://github.com/guardian/frontend into discussion-email-verification

Conflicts:
	common/app/assets/javascripts/bootstraps/common.js
	common/app/assets/javascripts/modules/analytics/livestats.js
	common/app/assets/javascripts/modules/discussion/comment-box.js
	common/app/assets/stylesheets/module/_discussion.scss
	common/app/assets/stylesheets/module/containers/_related.scss
	common/app/assets/stylesheets/module/containers/_top-stories.scss
	common/app/conf/switches.scala
	common/test/assets/javascripts/spec/LiveStats.spec.js
	dev-build/conf/routes
	diagnostics/app/common/DiagnosticsLifecycle.scala
	diagnostics/conf/routes
Merge branch 'master' of https://github.com/guardian/frontend into discussion-email-verification
app botstrap tidu
Silly stray whitespace obliteration
Grammar policing
simplifying blockquote quick fix here
fixing show more/newer/older/etc comments button text
Few merge problems and fixes
Merge branch 'discussion-email-verification' of https://github.com/guardian/frontend into discussion-email-verification