changed - with noop --> https://github.com/ronie/xbmc/commit/79f54f81acebcfcac206a6b94f3159d9eb28edba
Merge https://github.com/BigNoid/Aeon-Nox

Conflicts:
	1080i/Includes_MainMenu.xml
	1080i/SkinSettings.xml