Merge remote-tracking branch 'remotes/origin/develop'

Author: appinteractive

server/services/users/users.hooks.js

@@ -32,7 +32,7 @@ const badgesSchema = {
   include: {
     service: 'badges',
     nameAs: 'badges',
-    parentField: 'badgesIds',
+    parentField: 'badgeIds',
     childField: '_id',
     asArray: true
   }