Merge remote-tracking branch 'upstream/master'

Conflicts:
	1080i/Includes_MediaFlags.xml
	1080i/Includes_WidgetLayout.xml
	1080i/Viewtype_Shift.xml
	media/flags/resolution/1080.png
	media/flags/resolution/480.png
	media/flags/resolution/540.png
	media/flags/resolution/576.png
	media/flags/resolution/720.png
Merge branch 'master' of https://github.com/TheGovnah/skin.aeon.nox