Fix for parental control issue by Dima73
Merge branch 'master' of git://git.code.sf.net/p/openpli/enigma2 into BETA

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