Merge branch 'develop' into objectify_ep

Conflicts:
	src/node/utils/tar.json
	src/static/js/ace2_inner.js

src/node/handler/PadMessageHandler.js

@@ -128,7 +128,11 @@ exports.handleDisconnect = function(client)
       //Go trough all user that are still on the pad, and send them the USER_LEAVE message
       for(i in pad2sessions[sessionPad])
       {
-        socketio.sockets.sockets[pad2sessions[sessionPad][i]].json.send(messageToTheOtherUsers);
+        var socket = socketio.sockets.sockets[pad2sessions[sessionPad][i]];
+        if(socket !== undefined){
+          socket.json.send(messageToTheOtherUsers);
+        }
+        
       }
     }); 
   }
@@ -738,9 +742,10 @@ function handleClientReady(client, message)
       {
         for(var i in pad2sessions[message.padId])
         {
-          if(sessioninfos[pad2sessions[message.padId][i]].author == author)
+          if(sessioninfos[pad2sessions[message.padId][i]] && sessioninfos[pad2sessions[message.padId][i]].author == author)
           {
-            socketio.sockets.sockets[pad2sessions[message.padId][i]].json.send({disconnect:"userdup"});
+            var socket = socketio.sockets.sockets[pad2sessions[message.padId][i]];
+            if(socket) socket.json.send({disconnect:"userdup"});
           }
         }
       }

src/node/hooks/express/static.js

@@ -35,7 +35,7 @@ exports.expressCreateServer = function (hook_name, args, cb) {
   // serve plugin definitions
   // not very static, but served here so that client can do require("pluginfw/static/js/plugin-definitions.js");
   args.app.get('/pluginfw/plugin-definitions.json', function (req, res, next) {
-    res.header("Content-Type","application/json; charset: utf-8");
+    res.header("Content-Type","application/json; charset=utf-8");
     res.write(JSON.stringify({"plugins": plugins.plugins, "parts": plugins.parts}));
     res.end();
   });

src/node/server.js

@@ -51,8 +51,9 @@ console.log("Report bugs at https://github.com/Pita/etherpad-lite/issues")
 
 var serverName = "Etherpad-Lite " + version + " (http://j.mp/ep-lite)";
 
-//cache 6 hours
-exports.maxAge = 1000*60*60*6;
+//cache 6 hours, by default
+var hour = 60*60;
+exports.maxAge = settings.maxAge || 6 * hour;
 
 //set loglevel
 log4js.setGlobalLogLevel(settings.loglevel);

src/node/utils/tar.json

@@ -1,6 +1,7 @@
 {
   "pad.js": [
     "jquery.js"
+  , "underscore.js"
   , "security.js"
   , "pad.js"
   , "ace2_common.js"
@@ -25,6 +26,7 @@
   ]
 , "timeslider.js": [
     "jquery.js"
+  , "underscore.js"
   , "security.js"
   , "undo-xpopup.js"
   , "json2.js"
@@ -51,6 +53,8 @@
   ]
 , "ace2_inner.js": [
     "ace2_common.js"
+  , "underscore.js"
+  , "rjquery.js"
   , "AttributePool.js"
   , "Changeset.js"
   , "security.js"