* upstream/master:
bbb-conf --check warns you if you have SSL configured by still have FreeSWITCH listening on port 5066
Cleanup formatting of port for nginx in bbb-conf --check
fixed userlist and chat scrolling in Firefox
Escaping Java's properties file instructions
In recording playback, chat links open in a new tab
cleanup
limit sound on unread chat via Settings and Config
* 'refactor-api-captions' of https://github.com/oswaldoacauan/bigbluebutton:
Fixed closed-captions view box placement
recover redirect to html5 client on android device
fix typo in closed caption locale string
add German to html5 client (from Transifex)
HTML5 - changed a variable name
HTML5 - added a variable to check currentUser is moderator or the user is currently logged in
HTML5 - clear status on userlist
* upstream/master: (26 commits)
remove screenshare webrtc options from config.xml because they aren't fully implemented
log line was displaying null values
fix incorrect screenshare stream uri on reconnect
HTML5 - changed arrow color of presentation
HTML5 - moved the openChats() to outside of container
improve detection of duplicates + cleanup
allow view for 2+ webcams per user. improve duplicate detection
add custom poll option text to locales
HTML5 - added openChat() in createContainer()
HTML5 - did lint code
make meetingname field required
add parameter to join as moderator
HTML5 - changed componentDidUpdate() and added params
addition to pr 3564
HTML5 - added checking prevProps is undefined
HTML5 - added playing sound automatically when the user gets new messages
add a pre-filled meetingname field in html5 demo page
Restoring annotations when swapping presentation with video
fix for the case where last voice user was kicked
Use formatted messages for button labels
...
