Fixed GS when pressing Info or EPG Button (Missing imports)
Merge remote-tracking branch 'upstream/master'

Conflicts:
	data/keymap.xml
	lib/python/Components/About.py
	lib/python/Plugins/Extensions/MediaPlayer/plugin.py
	lib/python/Screens/EpgSelection.py
	lib/python/Screens/InfoBarGenerics.py
	lib/python/Screens/Makefile.am (reverse-merged from commit 433025d79bd5b85fed15f8d4325823c6440697a5)
some merges
some other merges
merge
some new files
merge
merge
merge
enigma.cpp
merge lib/dvb
merge lib/gdi
merge lib/base
merge about.py
changelog
new feature screensaver in radiomode
new merge scansetup.py
merge directories.py
currently not working merge
fix blackscreen if zapping in single and multi epg