Merge branch 'master', remote-tracking branch 'origin'
Always refresh collections after poll. Unblock the UI later
Detach copied item from source, after first use
Merge branch 'master' into facia-tool-fixes
Make SVG icons scalable
upped to latest version of the test FW
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
Added metrics for Video confidence
Merge branch 'master' of github.com:guardian/frontend into video-confidence

Conflicts:
	common/app/assets/javascripts/bootstraps/media.js
fixing flash prerolls
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