Merge branch 'matteo/server' into matteo/frontend

# Conflicts:
#	.eslintrc.json

.prettierignore

@@ -0,0 +1 @@
+*.graphql

modules/core/graph/schemas/streams.graphql

@@ -32,6 +32,8 @@ type StreamCollaborator {
   id: String!
   name: String!
   role: String!
+  company: String
+  avatar: String
 }
 
 type StreamCollection {

modules/core/services/streams.js

@@ -140,10 +140,10 @@ module.exports = {
 
   async getStreamUsers( { streamId } ) {
     let query =
-      Acl( ).columns( { role: 'stream_acl.role' }, 'id', 'name' ).select( )
+      Acl( ).columns( { role: 'stream_acl.role' }, 'id', 'name', 'company', 'avatar' ).select( )
         .where( { resourceId: streamId } )
         .rightJoin( 'users', { 'users.id': 'stream_acl.userId' } )
-        .select( 'stream_acl.role', 'name', 'id' )
+        .select( 'stream_acl.role', 'name', 'id', 'company', 'avatar' )
         .orderBy( 'stream_acl.role' )
 
     return await query