...
Merge branch 'master' of git://github.com/BigNoid/Aeon-Nox

Conflicts:
	1080i/Viewtype_ShowcaseMovies.xml