Fix conflicts

bigbluebutton-html5/Gruntfile.js

bigbluebutton-html5/grunt-instructions.txt

.../ui/components/actions-bar/actions-dropdown/component.jsx

...mports/ui/components/actions-bar/emoji-menu/component.jsx

...button-html5/imports/ui/components/dropdown/component.jsx

...n-html5/imports/ui/components/dropdown/list/component.jsx

...l5/imports/ui/components/dropdown/list/item/component.jsx

...tml5/imports/ui/components/dropdown/trigger/component.jsx

...rts/ui/components/nav-bar/settings-dropdown/component.jsx

...utton-html5/imports/ui/components/user-list/component.jsx

...orts/ui/components/user-list/user-list-item/component.jsx

bigbluebutton-html5/package-lock.json

bigbluebutton-html5/package.json

...ebutton-html5/private/config/production/server/shell.yaml

bigbluebutton-html5/private/config/server/shell.yaml

bigbluebutton-html5/private/locales/en.json

bigbluebutton-html5/start.sh