Merge userManagement branch to master

2016-02-14 20:45:04 -05:00
commit 3b7330ca75
@@ -15,5 +15,13 @@
        }
      }
    ]
+  },
+  "public": {
+    "staleSessionInactivityTimeout": 300000,
+    "staleSessionHeartbeatInterval": 30000,
+    "staleSessionPurgeInterval": 15000,
+    "staleSessionActivityEvents": "mousemove click keydown",
+    "showCountdownDialog": true,
+    "dialogTimeout": 30000
  }
 }