Conflicts:
	deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/red5/DeskshareApplication.scala
	deskshare/app/src/main/scala/org/bigbluebutton/deskshare/server/stream/StreamManager.scala