Merge PixelStream and ParallelPixelStream (fix Issue #37). Adapted DesktopStreamer.
Merge branch 'master' into pixelstreammerge

Conflicts:
	apps/DesktopStreamer/src/MainWindow.cpp