Solve GSOD when numberzap was used in the SimpleChannelSelection Class
Add option to select a different channel in channel EPG

By using the simpleCHannelSelection.
Please note that next/previous service will still be focus on the previous
selected service. I still need to discover how I can arrange the focus to
the latest selected service
Add option in SimpleChannelSelection to open current bouquet
When using SimpleChannelSelection go directly to current bouquet

And fix a GDOD when exit/cancel was pressed in the channelSelection. Sorry
for mixing this up.
In TimerEdit also go to current bouquet for channel selection

And not anymore to the bouquets list first
Merge branch 'master' of git://git.code.sf.net/p/openpli/enigma2 into 4.2-development

Resolved Conflicts:
	lib/python/Screens/ChannelSelection.py