Merge manual con el repo de SuperBerny
Merge remote-tracking branch 'upstream/master' rankstar

Conflicts:
	CHANGELOG.md
	img/livetv.jpg
	img/seriesdanko.png
	img/seriesflv.png
	img/splivetv_interdeportes.png
	peli-xr.js