Update version checks
Fix path.join in Settings.js
Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop
Merge branch 'custom-obj-msg' of github.com:ether/etherpad-lite into develop
fix typo
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
pump isdeprecated
expires was never defined
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
fix "util.pump() is deprecated. Use readableStream.pipe()"

fix error introduced by b3988e3 
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
When there is just one session and this one is invalid SecurityManager.checkAccess would cause the request to hang forever because the callback is omitted for each invalid session, this fixes this issue.
validSession still remains false so this does not cause issues further down.
Log when a sessionID in checkAccess is not found
Decode the sessionID before sending it to the server since our separator ',' gets encoded
Merge pull request #1689 from mluto/fix-checkAccess-omitted-cb

Fix missing callback in SecurityManager.checkAccess
Merge pull request #1691 from mluto/socketio-decode-cookie-session

Decode the sessionID before sending it to the server
Merge branch 'develop' of github.com:ether/etherpad-lite into develop
Update ueberDB to add support for node 0.10.x
Merge branch 'feature/support-node-0.10' into develop

Conflicts:
	src/package.json