Update main/bsod.cpp
[SoftwareUpdate] fix typo.
openvix: build 683
[NimManager] add 'Tone amplitude' to config list IF nim supports it.
[Keymap] fix double entry in playlist mediaportal
Merge branch 'master' of github.com:openatv/enigma2
Merge branch 'master' of git://github.com/OpenViX/enigma2

Conflicts:
	ChangeLog
clean whitespace fix ini3 rc
rcinput: remove duplicate identical check.
rcinput: cosmetics: coding style police: fix indents and coding style.
add oem brandings
rcinput: cosmetics: forgot a colon while policing code.
rcinput: workaround for VU+ solo2 remote control driver.

The solo2 remote control driver offers all possible
devices (remote control, keyboard, mouse, touchpad)
through one event device node, which confuses enigma,
because enigma assumes that a device that has an 'A'
key, can in fact send that key (and other letters),
while the remote control cannot send letters actually.

This fixes the remote control problems on the VU+ solo,
but it may break non-remote-control devices on this STB.

Also this workaround may or may not be required on
other VU+ STBes.
re-add FastScan to feeds.
[EpgSelection] fix 24 Hour time jump, and add support for 30 min intervals.
Merge commit 'c50c3502146be124e2e82f47e8c40b59ae51c396'
Merge branch 'master' of git://github.com/OpenViX/enigma2

Conflicts:
	lib/driver/rcinput.cpp
	lib/python/Plugins/SystemPlugins/Makefile.am
NimManager: show DVB-T2 / DVB-S2 in multi-type NIM selection

We used to show DVB-T / DVB-S, even if a NIM supported T2 / S2
This did not allow us to use NIM.isCompatible, because
though DVB-S is compatible with DVB-S2, DVB-S2 is not
necessarily compatible with DVB-S.
ScanSetup: add system selection in DVB-T single transponder scan

also, add PLP setting when DVB-T2 is selected
change 1 for compatible with azbox path