add googfc to allowable query strings
style badge slot
add switch for sponsored badges
badge code served from dfp
Adding truncation to football liveblogs
styling for no ad
Abstraction of show more button
correct classes on collections
correct class name
Button sass tidy up
Add a new size to the textsans font scale
Remove section-head and simplify localnav title
Coding conventions
Remove unused font scale values
Fix buttons to work with non SVG browsers
Merge branch 'master' of github.com:guardian/frontend into font-scale-tweaks

Conflicts:
	common/app/assets/stylesheets/_vars.scss
Finally got the timezones sorted out I think
correctly remove ad label if event is empty
Merge pull request #3912 from guardian/football-liveblog-truncation

Adding truncation to football liveblogs
Merge pull request #3920 from guardian/commercial-remove-label-bug

Commercial: correctly remove ad label if event is empty