Indicate the user has to click ALLOW in Chrome.
user list now loads (some bugs though )
fixed an issue with keepToolbarVisible and an issue with the toolbar dissapearing when clicking the presentation window
 - move the html5 client out of labs
Merge branch 'master' into html5-bridge-new-events
Fix for issue #1656
Merge pull request #299 from bigbluebutton/bbb-lock-settings

Implemented lock settings in bbb-client and bbb-apps.
Merge pull request #300 from BBBManager/bbb-issue-1656

Fix for issue #1656
Merge branch 'v0.81' into record-button

Conflicts:
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/views/MainToolbar.mxml
fixing the handling of multiple drawings from a single shape
bug could be easily reproduced typing text, erase part of it and then type again
Fixed copyright string in pt_BR
Merge branch 'master' of https://github.com/bigbluebutton/bigbluebutton into record-button

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/recorder/participants/ParticipantsEventRecorder.java
	bigbluebutton-client/branding/default/style/css/BBBDefault.css
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
reverting back the previous icons for webcam, headset and deskshare
implemented the new set of icons for the record button
Merge pull request #301 from mconf/record-button-master

Adding Start/Stop Recording feature
Merge pull request #297 from SenecaCDOT-BigBlueButton/fix-whiteboard-toolbar-visibility

fixed an issue with keepToolbarVisible and an issue with the toolbar dissapearing when clicking the presentation window
Merge branch 'new-polling-feature' of github.com:bigbluebutton/bigbluebutton into new-polling-feature
Merge branch 'master' into merge-polling-with-master
 - there are compile issues we need to fix

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/BigBlueButtonApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/ParticipantUpdatingRoomListener.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/Room.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/RoomsManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/messaging/MessagingConstants.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsApplication.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsEventSender.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/participants/ParticipantsService.java
	bigbluebutton-apps/src/main/webapp/WEB-INF/bbb-apps.xml
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UserService.as
	bigbluebutton-client/src/org/bigbluebutton/main/model/users/UsersSOService.as
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml
Merge branch 'audiosettings' into merge-polling-with-master
Merge branch 'refactor-voice-users' into merge-polling-with-master

Conflicts:
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceHandler.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/conference/service/voice/VoiceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/red5/voice/ClientManager.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/ConferenceService.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/events/VoiceUserJoinedEvent.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomImp.java
	bigbluebutton-apps/src/main/java/org/bigbluebutton/webconference/voice/internal/RoomManager.java
	bigbluebutton-client/src/org/bigbluebutton/modules/present/ui/views/SlideView.mxml