fixed failed merge :)
Merge branch 'master' of https://github.com/pasiz/xbmc-finnish-tv

Conflicts:
	plugin.video.ruutu/addon.xml