supplement to 0013e139a58e75d50bd9414309fe845f9446874c, fix upnpplayer mode
Merge remote-tracking branch 'cool-cst-next/cst-next'
Merge remote-tracking branch 'MaxWiesel/master'

Conflicts:
	src/gui/infoviewer_bb.cpp