VID-1825 Remove whitespace between tags
VID-1825 Speaking of whitespace...
Merge branch 'dev' into VID-1825

Conflicts:
	skins/oasis/css/core/thumbnails.scss
Merge pull request #4121 from Wikia/VID-1825

VID-1825 Remove whitespace between tags