Fix conflicts

bigbluebutton-html5/client/main.html

bigbluebutton-html5/imports/api/common/server/helpers.js

...ports/api/slides/server/modifiers/addSlideToCollection.js

bigbluebutton-html5/imports/startup/client/routes.js

bigbluebutton-html5/imports/ui/components/app/component.jsx

bigbluebutton-html5/imports/ui/components/app/container.jsx

...omponents/chat/message-list/message-list-item/styles.scss

bigbluebutton-html5/imports/ui/components/chat/service.js

...tml5/imports/ui/components/user-avatar/color-generator.js

...ton-html5/imports/ui/components/user-avatar/component.jsx

...utton-html5/imports/ui/components/user-avatar/styles.scss

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

...mports/ui/components/user-list/chat-list-item/styles.scss

...uebutton-html5/imports/ui/components/user-list/service.js

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

...tml5/imports/ui/components/whiteboard/slide/component.jsx