[ChoiceBox] fix autoresize of dialog.
Added support for ContextMenu-button
openvix: build 983
Some code cleanup
Merge branch 'master' of git://github.com/OpenViX/enigma2

Conflicts:
	data/keymap.xml
	lib/python/Screens/ButtonSetup.py
Ensure Lastscanned userbouquet is added at the end of the list

While upgrading settings the LastScanned userbouquet appears at the begin of the list in case the downloadable settings do not contain that bouquet. This commit ensures it will be pushed at the end of all service lists

Conflicts:
	lib/dvb/db.cpp