generic img
Merge branch 'master' of https://github.com/moremedia/Com-Hem-Viasat--Champions-League

Conflicts:
	application/themes/comhem-viasat-cl/js/entries.js