fix merge
Merge branch 'master' of github.com:settopbox-support/stbgui

Conflicts:
	lib/python/Screens/About.py