Fixed merge conflicts

.meteor/packages

@@ -16,17 +16,14 @@ less
 meteor-platform
 reactive-var
 service-configuration
-
 chrismbeckett:toastr
 francocatena:status
 jparker:gravatar
-kevohagan:sweetalert
 konecty:autolinker
 konecty:change-case
 konecty:delayed-task
 konecty:mongo-counter
 konecty:multiple-instances-status
-konecty:nrr
 konecty:user-presence
 mizzao:autocomplete
 mizzao:timesync
@@ -56,17 +53,13 @@ tmeasday:errors
 todda00:friendly-slugs
 underscorestring:underscore.string
 yasaricli:slugify
-<<<<<<< HEAD
 konecty:nrr
-konecty:change-case
 kevohagan:sweetalert
 raix:ui-dropped-event
 cfs:standard-packages
 cfs:gridfs
-=======
 meteorhacks:kadira
 meteorhacks:flow-router
 meteorhacks:flow-layout
 arunoda:streams@0.1.17
 rocketchat:webrtc
->>>>>>> master

client/views/app/room.html

@@ -1,4 +1,5 @@
 <template name="room">
+	<div id=dropzone>
 	<section class="messages-container" id="{{windowId}}">
 		<header class="fixed-title">
 			<div class="burger">