nhttpd/tuxboxapi: fix messed up defines (thanks to Thomas Richter for spotting this)
system/nkparser: add f4m support
gui/movieplayer: implement multi-program support
Merge remote-tracking branch 'martiis-neutrino-mp/master'

Conflicts:
	src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
	src/nhttpd/tuxboxapi/coolstream/neutrinoyparser.cpp