Combine NonThreaded controller into Comments controller
inline comment timestamp
Update test data
change comment relative date format
add comment permalink icon
missing semicolon
Discussion js app unthreaded support
Discussion linting
Merge remote-tracking branch 'origin/d-stylefixes' into discussion-unthreaded-fixes

Conflicts:
	static/src/stylesheets/module/_discussion.scss
Do not pass true to discussion api threading
Fix issue with date and latest update appearing for all containers
Merge pull request #6359 from guardian/fix-time-issue

Fix issue with date and latest update appearing for all containers
stop ff collapsing
pad vertical sublinks on tonal backgrounds
Update tests
Use code-based discussion data files
Merge pull request #6354 from guardian/discussion-unthreaded-fixes

Discussion unthreaded fixes
strech horizontal footer on vertical items
hide images on cutouts
Merge pull request #6363 from guardian/css-bugs

Css bugs