Merge branch 'master', remote-tracking branch 'origin'
Make SVG icons scalable
Apply css coding conventions to discussion
Import missing mixins in membership Sass file
Move states into the base directory
Move gu-image from states to from-content-api
Apply coding conventions to search scss
Remove unused circular progress
Apply coding conventions to tabs
Simplify fetching line-height in vjs small title
Fix line-height in small overlay title
Merge branch 'master' of github.com:guardian/frontend into coding-conventions-sass
Merge branch 'master' of github.com:guardian/frontend into scale-svg-icons
Use rem mixin in sprite files
Add enhanced video player switch
Wrap video adverts and player in kill switches
bind content events when ad switch is off
Merge branch 'master' of github.com:guardian/frontend into scale-svg-icons

Conflicts:
	common/app/assets/stylesheets/module/content/_media.global.scss
Fix default styling of video player sans JavaScript enhancement
Fix merge conflicts