Merge branch 'development' into ircv3

diff --cc client/assets/dev/model_application.js
index 6fd5632307d99fbf229307546982b003e72effca,b08ea49837dbc58540eda8eadcb79026be01394b..8c6950af946762b4389595ee63bf8d3ea83146fa
--- 1/client/assets/dev/model_application.js
--- 2/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@@ -570,26 -613,15 +613,26 @@@ _kiwi.model.Application = function () 
                  }\r
              });\r
  \r
 +            gw.on('onaway', function (event) {\r
 +                $.each(that.panels.models, function (index, panel) {\r
 +                    if (!panel.isChannel()) return;\r
 +\r
 +                    member = panel.get('members').getByNick(event.nick);\r
 +                    if (member) {\r
 +                        member.set('away', !(!event.trailing));\r
 +                    }\r
 +                });\r
 +            });
 +\r
  \r
              gw.on('onlist_start', function (data) {\r
-                 if (kiwi.app.channel_list) {\r
-                     kiwi.app.channel_list.close();\r
-                     delete kiwi.app.channel_list;\r
+                 if (_kiwi.app.channel_list) {\r
+                     _kiwi.app.channel_list.close();\r
+                     delete _kiwi.app.channel_list;\r
                  }\r
  \r
-                 var panel = new kiwi.model.Applet(),\r
-                     applet = new kiwi.applets.Chanlist();\r
+                 var panel = new _kiwi.model.Applet(),\r
+                     applet = new _kiwi.applets.Chanlist();\r
  \r
                  panel.load(applet);\r
                  \r

diff --cc client/assets/dev/model_gateway.js
Simple merge

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