fix wizard
Merge branch 'master' of github.com:OpenELEC/service.openelec.settings into settings-next

Conflicts:
	addon.xml
	changelog.txt