...
Merge branch 'master' of https://github.com/Vaikin/Aeon-Nox

Conflicts:
	1080i/MyVideoNav.xml