[settings] enigma2 default settings
[settings] cleanup
Merge branch 'master' into beta

Conflicts:
	data/Makefile.am