* upstream/master: (26 commits)
Fix lint issues
Fix lint issues
Fix a few lint problems
fix missing import causing breakouts to not work
Delete the initially converted swf to be sure that if fallback convertion does not work we get the blank swf loaded.
Fix poll options remain visible on html5, closes#3806 HTML5
- user internal userId instead of external userId in register user message
remove unnecessarily added svgs
updated icons to v11, adjusted few icons
Fix merge algoritm problem
set chat input color to gray (text-color)
Fixed user leave problem on private chat, close#3799 HTML5
align emojis horizontally
Check userId when validating token
Cleanup - remove extra > on meeting name on getRecording API response
Check for WebRTC availability instead of checking for the browser name to display the AudioSelectionWindow browser hint.
Display "Recommend using either Firefox or Chrome for better audio" when any of other browser is used.
improved logic for updating message-list
Change to fetch from chat system id, issue #3792 HTML5
Fix multiple welcome messages, issue #3792 HTML5
...
* upstream/master: (47 commits)
Added ExitApplicationEvent.as
HTML 5 - changed css for divider
No more display the LoggedOutWindow.mxml if the user has explicitly clicked on yes to confirm the logout action.
Link "enableEmojiStatus" enabled/disabled to the emoji button.
initialize html5StunTurn properly - complication from PR 3628
fix bug preventing stun/turn call
fix lint issues
rework userPermissions to allow mixture of role/status based actions
Handle exception when sending message to client
HTML5 - changed divider of record button
Change the emoji menu icon to the happy face.
don't show promote option for presenter user'
remove glow prop and use className to change style
reorganize user actions
clean up
improve userPermissions by rearranging logic
allow for mute/unmute by moderator
rename css class
Display breakout rooms user names in row tooltip.
fix setPresenter and kick user
...
