Merge branch 'staging' into nightly

data/web/js/site/user.js

@@ -214,6 +214,14 @@ jQuery(function($){
           data: 'address',
           defaultContent: ''
         },
+        {
+          title: lang.description,
+          data: 'description',
+          defaultContent: '',
+          render: function (data, type) {
+            return escapeHtml(data);
+          }
+        },
         {
           title: lang.alias_valid_until,
           data: 'validity',