resolved merge issue
have the webcam rendered in playlist-screen
periodic Merge remote-tracking branch 'origin/master' into webserver

Conflicts:
	game/screen_playlist.cc
	game/screen_playlist.hh