Merge with development branch

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

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

diff --cc client/assets/dev/view.js
index cc4513bf0692225487a5e5f32c3bd17d45afcc4b,7f916a86f937df2f13c905501daa48e7aa5b649b..23bd6f7c9f6aa5dbbecf4e11222eedb067a7db94
--- 1/client/assets/dev/view.js
--- 2/client/assets/dev/view.js
+++ b/client/assets/dev/view.js
@@@ -677,11 -733,11 +739,12 @@@ _kiwi.view.Tabs = Backbone.View.extend(
  \r
          if (panel.isServer()) {\r
              panel.tab.addClass('server');\r
+             panel.tab.addClass('icon-nonexistant');\r
          }\r
  \r
 -        panel.tab.data('panel_id', panel.cid)\r
 -            .appendTo(panel.isApplet() ? this.tabs_applets : this.tabs_msg);\r
 +        panel.tab.data('panel', panel)\r
 +            .appendTo(this.$el);\r
 +            //.appendTo(panel.isApplet() ? this.tabs_applets : this.tabs_msg);\r
  \r
          panel.bind('change:title', this.updateTabTitle);\r
          _kiwi.app.view.doLayout();\r