Merge with development branch (New server codebase)

diff --cc .gitignore
index 686080c209cb70ee947688c89d3f8a80d619c3da,9314688362f9694b28f29e997b82a13e3681bbbb..67f8b97acaa0011a2a57b66727cb2f60eea30228
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -2,5 -2,7 +2,7 @@@
  node/node_modules/
  node_modules/
  doc/
 -client/kiwi.js
 -client/kiwi.min.js\r
 -kiwi.log\r
 -kiwiirc.pid
 +client/assets/kiwi.js
 +client/assets/kiwi.min.js
++kiwi.log
++kiwiirc.pid

diff --cc package.json
index 1801cfe103e12384dd04857d9bb83840b79dd997,b5fdaedb3e3aeca0770eb3f00d964f8519137a50..d9831670cd0f2feb28fcd4806bdbd60310b1ccbd
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -8,6 -5,7 +8,7 @@@
      "node-static": "0.5.9",\r
      "uglify-js": "1.2.3",\r
      "socket.io": "0.8.7",\r
-     "underscore": "1.3.3"\r
+     "underscore": "1.3.3",\r
+     "daemonize2": "0.4.0-rc.5"\r
    }\r
 -}
 +}\r