Merge branch 'standalone_develop' into pre_trustie_server

app/views/users/_user_small.json.jbuilder

@@ -3,6 +3,8 @@ json.array! users do |user|
   json.username user.full_name
   json.login user.login
   json.user_id user.id
+  json.mail user.mail
+  json.custom_department user.custom_department
   json.image_url url_to_avatar(user)
   json.profile_completed user.profile_completed
 end