Merge branch 'master' into production

Author: Ricardo Malta

lib/socket.js

@@ -18,14 +18,14 @@ module.exports = (server, callback) => {
   io.on('connection', (socket) => {
     socket.join('public');
     log.info(socket.id, 'connected');
-    models.messages.list((err, messages) => {
+    models.messages.list('public', (err, messages) => {
       if (err) {
         log.error(err);
         return;
       }
       let messagesByGroup = _.groupBy(messages, 'Room');
       for (let room in messagesByGroup) {
-        io.to(socket.id).emit('messages', messagesByGroup[room].map((m) => { return m }));
+        io.to(socket.id).emit('messages', messagesByGroup[room].map((m) => { return m; }));
       }
     });
   });