Updated comment markup
Merge branch 'discussion' of https://github.com/guardian/frontend into discussion

Conflicts:
	discussion/app/views/fragments/comment.scala.html
Moved CSS to stylesheet
Preparing markup/JS for new design
Merge branch 'discussion' of https://github.com/guardian/frontend into discussion