Merge branch 'master' of github.com:guardian/frontend into discussion
Merge branch 'discussion' of github.com:guardian/frontend into discussion
Wired up Json for Discussion
Merge branch 'discussion' of github.com:guardian/frontend into discussion

Conflicts:
	discussion/app/controllers/CommentPageController.scala