Merge branch 'master' of github.com:guardian/frontend into rem-mixin
Blend between news container and facia v1
Merge branch 'master' of github.com:guardian/frontend into news-container-v2

Conflicts:
	common/app/assets/stylesheets/global.scss
Merge branch 'master' of github.com:guardian/frontend into news-container-v2
splitting into sport/news container
Coding conventions and robustness
Merge branch 'news-container-v2' of github.com:guardian/frontend into news-container-v2
put sport stats in correct container
Merge branch 'master' of github.com:guardian/frontend into news-container-v2
fixed missing headline mixin
Fix image / no image logic
Remove headline clamping
clean up new lines in class list
Merge branch 'news-container-v2' of github.com:guardian/frontend into news-container-v2
Comma
Merge branch 'news-container-v2' of github.com:guardian/frontend into news-container-v2
Merge branch 'master' of github.com:guardian/frontend into news-container-v2
not showing header in news container
Merge branch 'news-container-v2' of github.com:guardian/frontend into news-container-v2
Merge branch 'master' of github.com:guardian/frontend into news-container-v2