Channelselection: Re-add parental control check pipzap/zap via context menu
Channelselection: simplify some code around config in context menu
ChannelSelection: more cleanups and add red key in context menu

first sorry for committing several changes in one commit

- redkey for play service is mainscreen when in pipzap
- block red and blue key in context menu, this was a hole in the parental
  lock for a long time
- cleanup some code
ChannelSelection: cleanup some code - pure cosmetic
ChannelSelection: always show pip and play in mainscreen in contextmenu
db.cpp: remove a not required line of code
Simplify the code around the renumbering of the services
Merge branch 'master' of git://git.code.sf.net/p/openpli/enigma2 into BETA

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