Merge branch 'promise' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-promise

Conflicts:
	package.json

diff --cc client/assets/plugins/textstyle.html
index 4fc54ca51e3f0e4e067dd4ea037ea0e7460e981e,3567d4dc5055eaff4c59bc5258196ea4cd29558e..39ac9d03f7b838c768a7e79c7f822e6fb25c6374
--- 1/client/assets/plugins/textstyle.html
--- 2/client/assets/plugins/textstyle.html
+++ b/client/assets/plugins/textstyle.html
@@@ -138,8 -138,10 +138,10 @@@
  
              // Add the styles to the emssage
              if (data.params[1]) {
 -                data.params[1] = style_codes + ' ' + data.params[1];
 +                data.params[1] = style_codes + data.params[1];
              }
+ 
+             event.callback();
          });
  
  

diff --cc client/src/app.js
Simple merge

diff --cc client/src/index.html.tmpl
Simple merge

diff --cc client/src/models/network.js
Simple merge

diff --cc package.json
index 9538dac760a418fc9ef040fd3f3452adb402ce96,a8b038195aaa8ccc28e25e07898c4a6d4f0eed32..d79ec21ac650819b13ec4c3f899a4f75e625b83a
--- 1/package.json
--- 2/package.json
+++ b/package.json
@@@ -15,18 -15,19 +15,19 @@@
      "postinstall": "node client/build.js"
    },
    "dependencies": {
-     "node-static": "0.7.4",
-     "uglify-js": "2.4.15",
-     "engine.io": "^1.4.0",
-     "lodash": "2.4.1",
      "daemonize2": "0.4.2",
 -    "engine.io": "1.2",
++    "engine.io": "^1.4.0",
+     "es6-promise": "^1.0.0",
 -    "eventemitter2": "0.4.13",
 -    "iconv-lite": "0.2.11",
 -    "ipaddr.js": "0.1.2",
 +    "eventemitter2": "0.4.14",
-     "ipaddr.js": "0.1.3",
-     "socksjs": "0.4.4",
 +    "iconv-lite": "0.4.4",
-     "spdy": "1.28.1",
-     "po2json": "0.3.0",
++    "ipaddr.js": "0.1.3",
+     "lodash": "2.4.1",
      "negotiator": "0.4.3",
 -    "node-static": "0.7.3",
 -    "po2json": "0.2.3",
++    "node-static": "0.7.4",
++    "po2json": "0.3.0",
+     "socksjs": "0.4.4",
+     "spdy": "1.19.1",
+     "uglify-js": "2.4.12",
      "winston": "~0.7.2"
    },
    "engines": {

diff --cc server/httphandler.js
Simple merge

diff --cc server/irc/connection.js
Simple merge

diff --cc server/irc/state.js
Simple merge

diff --cc server/settingsgenerator.js
Simple merge