Merge Armada changes
Merge branch 'master' into armada_staging

Conflicts:
	1080i/Home.xml
	addon.xml
Fix gui shutdown button
Fixup for android
Armada 1.0.0 (Quartz 4.5.2 Reskin)
Fix typo