upnpbrowser.cpp -add show logo/pic
gui/movieplayer.cpp: change playback instance number
zapit/src/fastscan.cpp: fix extra InitFastscanLnb call
zapit/src/capmt.cpp: allocate demuxes in constructor
zapit/src/zapit.cpp: remove PIP_DEMUX usage
zapit/src/femanager.cpp: change free demux for PiP detection
gui/bouquetlist.cpp: fix crash
gui/bouquetlist.cpp: fix warning
upnpbrowser.cpp fix for show pic after play
gui/bouquetlist.cpp: another fix for bouquet epg scan option
gui/bouquetlist.cpp: another fix for bouquet epg scan option :D
Merge remote-tracking branch 'cool-next-cc/next-cc'

Conflicts:
	src/zapit/src/femanager.cpp