Merge branch 'beta'

Conflicts:
	configure.ac
	data/rc_models/Makefile.am
	data/rc_models/gb/rc.png
	data/rc_models/gb/remote.html
Revert "Merge branch 'beta'"

This reverts commit 8b6e1eca06d814fbb48183bd9c5d192db9b4f733, reversing
changes made to 148ec9af673faced0711745722f172ca25b4aceb.
[avswitch] some little changes back
[flashonline] fix getBrandOEM
merge remote
revert commit
[keymap] add web, plugin and media button for LX stb's
merge remote
[mytest] fix getBoxType()
update mytest.py
[infobar] fix bs if info pressed
gigablue ... just a try
[picon] fix possible bs
[avswitch] prepare for later use
better working version of videofinetune
Merge branch 'master' into beta

Conflicts:
	configure.ac
	data/rc_models/Makefile.am
	data/rc_models/gb/rc.png
	data/rc_models/gb/remote.html