src/nhttpd/web/Y_Live_EPG.yhtm: logo png
fix multiselect playlist
fix channellist freezer2
cosmetics
clear old merge
Merge branch 'master' of https://github.com/MaxWiesel/neutrino-mp-cst-next

Conflicts:
	src/gui/movieplayer.cpp