Merge branch 'client_plugins' into development

diff --cc client/assets/dev/model_application.js
index 2c4b2d33c1eed8d85240950e05099b6751ae4025,f8d37c70eb62301df107c478e51ccbca2c15f90a..c6400ba781daef911c8a0f457551d20694db0725
--- 1/client/assets/dev/model_application.js
--- 2/client/assets/dev/model_application.js
+++ b/client/assets/dev/model_application.js
@@@ -826,22 -817,20 +822,22 @@@ _kiwi.model.Application = function () 
                  _kiwi.gateway.changeNick(ev.params[0]);\r
              });\r
  \r
-             controlbox.on('command_query', queryCommand);\r
+             controlbox.on('command:query', queryCommand);\r
  \r
-             controlbox.on('command_topic', topicCommand);\r
+             controlbox.on('command:topic', topicCommand);\r
  \r
-             controlbox.on('command_notice', noticeCommand);\r
+             controlbox.on('command:notice', noticeCommand);\r
  \r
-             controlbox.on('command_quote', quoteCommand);\r
+             controlbox.on('command:quote', quoteCommand);\r
  \r
-             controlbox.on('command_kick', kickCommand);\r
+             controlbox.on('command:kick', kickCommand);\r
  \r
-             controlbox.on('command_clear', clearCommand);\r
+             controlbox.on('command:clear', clearCommand);\r
  \r
 +            controlbox.on('command_ctcp', ctcpCommand);\r
 +\r
  \r
-             controlbox.on('command_css', function (ev) {\r
+             controlbox.on('command:css', function (ev) {\r
                  var queryString = '?reload=' + new Date().getTime();\r
                  $('link[rel="stylesheet"]').each(function () {\r
                      this.href = this.href.replace(/\?.*|$/, queryString);\r