Added support for Hotkey
Add icons for ChoiceList - some teams use PLi code
Update Makefile.am for new icons
Adapted for changed button setup
Merge branch 'master' into 1080p

Conflicts:
	skin_default.xml