merge with master branch
Merge branch 'origin' into Frodo_customFanart

Conflicts:
	720p/DialogFullScreenInfo.xml
	720p/DialogSeekBar.xml
	720p/DialogVideoInfo.xml
	720p/Includes_Next_Aired_TV_Guide.xml
	720p/MyVideoNav.xml
	720p/SkinSettings.xml
	720p/ViewsTVLogo.xml
	720p/ViewsTVLogoRightlist.xml
	720p/ViewsVideoBannerlist.xml
	720p/ViewsVideoBannerwall.xml
	720p/ViewsVideoFanart.xml
	720p/ViewsVideoFanart2.xml
	720p/ViewsVideoFanartLandscape.xml
	720p/ViewsVideoFanartMovieSets.xml
	720p/ViewsVideoFanartSlide.xml
	720p/ViewsVideoHalfwall.xml
	720p/ViewsVideoRightlist.xml
	720p/ViewsVideoShowcase.xml
	720p/ViewsVideoShowcase_Mod.xml
	720p/ViewsVideoVertBannerwall.xml
	720p/ViewsVideoWall.xml
	720p/custom_TVGuide_1115.xml
	changelog.txt
	language/English/strings.po
update paths
paths to custom dir fixed
Merge branch 'origin' into Frodo_customFanart
Merge branch 'origin' into Frodo_customFanart
Merge branch 'origin' into Frodo_customFanart
Merge branch 'origin' into Frodo_customFanart

Conflicts:
	720p/ViewsTVLogoRightlist.xml
	720p/ViewsVideoRightlist.xml
update artwork naming
Merge branch 'origin' into Frodo_customFanart

Conflicts:
	720p/DialogVideoInfo.xml
	720p/Includes_Next_Aired_TV_Guide.xml
	720p/MyVideoNav.xml
	720p/ViewsTVLogo.xml
	720p/ViewsTVLogoRightlist.xml
	720p/ViewsVideoBannerlist.xml
	720p/ViewsVideoFanart.xml
	720p/ViewsVideoFanart2.xml
	720p/ViewsVideoRightlist.xml
	720p/ViewsVideoShowcase.xml
	720p/ViewsVideoShowcase_Mod.xml
Merge branch 'origin' into Frodo_customFanart
Merge branch 'origin' into Frodo_customFanart
language cleanup
wrong merge fixed