- try fixing this error

/mnt/tmp/bbb-transcode-akka_2.2.0_xenial_m22/build.sbt:134: error: object ServerLoader is not a member of package com.typesafe.sbt.packager.archetypes
serverLoading in Debian := com.typesafe.sbt.packager.archetypes.ServerLoader.Systemd

 - fix akka-transcode build failing on scalariform

 - fix screenshare redis connection error
 - fix bbb-web create meeting exception when second user joins

Fixed locked user to have the same height as a default user

Adjust the presentation upload to use the security token introduced in 2.1

# Conflicts:
#	bbb-common-web/src/main/java/org/bigbluebutton/presentation/imp/ImageToSwfSlidesGenerationService.java

Implementation of user typing feature to chat

Update help button icon for RLT layout

Clean unused parameters in ApiController.groovy

Display h264 video webcam stream for the iOS mobile client

Add a new message RecordStatusResetSysMsg to be handled and saved in events.xml

# Conflicts:
#	bigbluebutton-web/grails-app/controllers/org/bigbluebutton/web/controllers/ApiController.groovy

Down-scale image sized over 2MB

Pull V2.0.x release into 2.2 (master) to propagate 2.0 fixes

Only propagate necessary information to client

HTML5 client -- pulled latest language files 2018-09-10

Fix poll answers not being displayed on mobile safari

Update npm packages in bbb-html5

Make some devDependency npm packages full depencencies (needed in production)

Merge 2.0 into 2.2(master)