added a notification for when you are using webrtc
added styling to the fileupload help, also cleaned up some text
Merge remote-tracking branch 'upstream/master' into misc-client-fixes
Updates to images for webRTC audio
Better display of enablewebertc and disablewebrtc messages from bbb-conf
Adjusting icons to give prominence to joining by microphone
Minor tweaks to text phrases and icons
Minor bug fix in bbb-conf
Updated footer message in bigbluebutton.properties
Reverted WhiteboardToolbar spacers.
Merge pull request #365 from speakserve/revert-whiteboard-toolbar-alignments

Reverted WhiteboardToolbar spacers.
added notifications to the users window for room mute and lock state
Merge pull request #366 from SenecaCDOT-BigBlueButton/misc-client-fixes

Misc client fixes
 - send meeting status to client when user joins
 - mute late user if meeting is muted
 - when user joins voice, see if the meeting is muted and mute user if it is
 - when presenter receives page coordinates from server when dragging the slide, ignore the message
   so as not to reposition the page and creating a jerky page movement
 - show presentation conversion progress
Merge remote-tracking branch 'origin/master' into zoom-slider-bug