Removed confluence skin

Conflicts:

	addons/skin.confluence/720p/DialogAlbumInfo.xml
	addons/skin.confluence/720p/DialogButtonMenu.xml
	addons/skin.confluence/720p/DialogExtendedProgressBar.xml
	addons/skin.confluence/720p/DialogPVRGroupManager.xml
	addons/skin.confluence/720p/DialogPVRGuideInfo.xml
	addons/skin.confluence/720p/DialogSeekBar.xml
	addons/skin.confluence/720p/DialogVideoInfo.xml
	addons/skin.confluence/720p/Font.xml
	addons/skin.confluence/720p/Home.xml
	addons/skin.confluence/720p/IncludesHomeMenuItems.xml
	addons/skin.confluence/720p/MyWeather.xml
	addons/skin.confluence/720p/SkinSettings.xml
	addons/skin.confluence/720p/VideoOSD.xml
	addons/skin.confluence/720p/ViewsFileMode.xml
	addons/skin.confluence/720p/script-globalsearch-main.xml
	addons/skin.confluence/720p/weather/10DayForecast.xml
	addons/skin.confluence/720p/weather/HourlyForecast.xml
	addons/skin.confluence/720p/weather/WeekendForecast.xml
	addons/skin.confluence/addon.xml
	addons/skin.confluence/changelog.txt
	addons/skin.confluence/language/Afrikaans/strings.po
	addons/skin.confluence/language/Albanian/strings.po
	addons/skin.confluence/language/Arabic/strings.po
	addons/skin.confluence/language/Basque/strings.po
	addons/skin.confluence/language/Belarusian/strings.po
	addons/skin.confluence/language/Bosnian/strings.po
	addons/skin.confluence/language/Bulgarian/strings.po
	addons/skin.confluence/language/Catalan/strings.po
	addons/skin.confluence/language/Chinese (Simple)/strings.po
	addons/skin.confluence/language/Chinese (Traditional)/strings.po
	addons/skin.confluence/language/Croatian/strings.po
	addons/skin.confluence/language/Czech/strings.po
	addons/skin.confluence/language/Danish/strings.po
	addons/skin.confluence/language/Dutch/strings.po
	addons/skin.confluence/language/English/strings.po
	addons/skin.confluence/language/Esperanto/strings.po
	addons/skin.confluence/language/Estonian/strings.po
	addons/skin.confluence/language/Finnish/strings.po
	addons/skin.confluence/language/French/strings.po
	addons/skin.confluence/language/Galician/strings.po
	addons/skin.confluence/language/German/strings.po
	addons/skin.confluence/language/Greek/strings.po
	addons/skin.confluence/language/Hebrew/strings.po
	addons/skin.confluence/language/Hindi (Devanagiri)/strings.po
	addons/skin.confluence/language/Hungarian/strings.po
	addons/skin.confluence/language/Icelandic/strings.po
	addons/skin.confluence/language/Indonesian/strings.po
	addons/skin.confluence/language/Italian/strings.po
	addons/skin.confluence/language/Japanese/strings.po
	addons/skin.confluence/language/Korean/strings.po
	addons/skin.confluence/language/Latvian/strings.po
	addons/skin.confluence/language/Lithuanian/strings.po
	addons/skin.confluence/language/Macedonian/strings.po
	addons/skin.confluence/language/Malayalam/strings.po
	addons/skin.confluence/language/Norwegian/strings.po
	addons/skin.confluence/language/Persian/strings.po
	addons/skin.confluence/language/Polish/strings.po
	addons/skin.confluence/language/Portuguese (Brazil)/strings.po
	addons/skin.confluence/language/Portuguese/strings.po
	addons/skin.confluence/language/Romanian/strings.po
	addons/skin.confluence/language/Russian/strings.po
	addons/skin.confluence/language/Serbian (Cyrillic)/strings.po
	addons/skin.confluence/language/Serbian/strings.po
	addons/skin.confluence/language/Slovak/strings.po
	addons/skin.confluence/language/Slovenian/strings.po
	addons/skin.confluence/language/Spanish (Argentina)/strings.po
	addons/skin.confluence/language/Spanish (Mexico)/strings.po
	addons/skin.confluence/language/Spanish/strings.po
	addons/skin.confluence/language/Swedish/strings.po
	addons/skin.confluence/language/Thai/strings.po
	addons/skin.confluence/language/Turkish/strings.po
	addons/skin.confluence/language/Ukrainian/strings.po
	addons/skin.confluence/language/Vietnamese/strings.po

Conflicts:

	addons/skin.confluence/backgrounds/SKINDEFAULT.jpg