Merge branch 'master' of http://192.168.100.142:10080/robert/rest

models/models.py

@@ -17,8 +17,9 @@ class res_users(models.Model):
             'email': self.email,
             'image_small': self.image_small,
             'image_medium': self.image_medium,
+            'jwt_token': self.jwt_token,
             'company_id': self.company_id.id,
-            'partner_id': self.partner_id.id
+            'partner_id': self.partner_id.id,
         }
 
 '''