Merge branch 'bbb-webrtc-sfu' of github.com:prlanzarin/bigbluebutton-1 into bbb-webrtc-sfu

Removed several variables that were in this.state to this in the html5 video-dock component

Conflicts:
	bigbluebutton-html5/imports/ui/components/video-dock/component.jsx