Merged from origin master
Sending of video from client working
Merge branch 'master' into post-ch

Conflicts:
	server.js
remove legacy slideshare
Disable audio for silentConnect
Merge branch 'master' of https://github.com/robbriggs/orangepotato