Merge branch 'master' of github.com:guardian/frontend
re-order football tables
Merge branch 'master' of github.com:guardian/frontend
Unblock training fronts
Cancel the video ad framework if vast doesn't provide an advert
Merge pull request #7532 from guardian/cancel-failed-video-adverts

Cancel the video ad framework if vast doesn't provide an advert
Don't escape query
book inline added to the test page
Merge pull request #7528 from guardian/inline-book-test

Book inline component added to the test page
resolve merge conflicts and reorder tables
re add international friendlies
Merge pull request #7536 from guardian/football-reorder-tables

Football reorder tables
Merge pull request #7533 from guardian/facia-tool-og-fix

Facia tool: fix OpenGraph call
Merge pull request #7530 from guardian/config-tool-unlock-training

Config tool: unlock training fronts
fix broken test by football table re-order
Merge remote-tracking branch 'origin/master'
Update bower dependencies
Refactor front tools for configurable layout

Editors now can choose the number of columns to display in the front tool
Fix style issues when columns are too narrow
Redirect old links to the new layout