Upgrade to sbt v0.13.6 - uses HTTPS
Fix the white border to the left of hide on new style containers
Merge branch 'master' of github.com:guardian/frontend into use-secure-sbt
Add semi-transparent background to item meta on comment cards
Merge branch 'master' into fix-comment-count-overlap

Conflicts:
	common/app/assets/stylesheets/module/facia-cards/_items.scss
Fix comment margin in metadata so that it belongs to the comments, not the timestamp
Remove unnecessary border
Changed the order of competitions
Merge pull request #5994 from guardian/football-order

Changed the order of competitions
Merge pull request #5989 from guardian/fix-button-left-border

Fix the white border to the left of hide on new style containers
Merge pull request #5991 from guardian/fix-comment-count-overlap

Add semi-transparent background for comment count overlap on comment cards
Merge pull request #5937 from guardian/use-secure-sbt

Upgrade to sbt v0.13.6 - uses HTTPS
Merge branch 'master' into facia-temporary-background