vuplus: add timeshift support
vuplus: translation change
update
vuplus: remove unnecessary stuff
vuplus: fix typo in new setting
vuplus: remove obsolete channeldatapath from settings
vuplus: remove more now unused stuff
Merge remote-tracking branch 'upstream/master' into timeshift
vuplus: change epg handling
vuplus: test
vuplus: settings.xml fix
Merge remote-tracking branch 'upstream/master' into timeshift_and_epg
vuplus: add support for https webinterface
vuplus: add support for https webinterface
Merge remote-tracking branch 'upstream/master' into timeshift_and_epg
Merge remote-tracking branch 'upstream/master' into timeshift_and_epg
Merge branch 'timeshift_and_epg' of https://github.com/jdembski/xbmc-pvr-addons into jdembski-timeshift_and_epg

Conflicts:
	addons/pvr.vuplus/addon/changelog.txt
	addons/pvr.vuplus/src/VuData.cpp