Merge branch 'development' of https://github.com/CoryChaplin/KiwiIRC into text_themes

Conflicts:
	client/src/app.js
	client/src/models/member.js

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

diff --cc client/src/models/member.js
index a472b240fa16c81fc2b1295efc10ffd022db88e1,618fd78147a06f235d0ad8b5a3a2391bc28bbe14..88a4f45c8515352d07ebc55934dbcbf98f7ec6cb
--- 1/client/src/models/member.js
--- 2/client/src/models/member.js
+++ b/client/src/models/member.js
@@@ -105,14 -148,16 +148,18 @@@ _kiwi.model.Member = Backbone.Model.ext
  \r
          return display;\r
      },\r
 -\r
 -\r
 +    getMemberMask: function () {\r
 +        // Why to use %N and %H is quite clear here. %J is because %I is already for italic and %U for underlines. Better ideas ?\r
 +        return {'%N': this.get('nick'), '%J': this.get("ident"), '%H': this.get("hostname")};\r
 +    },\r
-     isOp: function () {\r
-         var user_prefixes = _kiwi.gateway.get('user_prefixes'),\r
+     /**\r
+      * With the modes set on the user, make note if we have some sort of op status\r
+      */\r
+     updateOpStatus: function () {\r
+         var user_prefixes = this.get('user_prefixes'),\r
              modes = this.get('modes'),\r
              o, max_mode;\r
+ \r
          if (modes.length > 0) {\r
              o = _.indexOf(user_prefixes, _.find(user_prefixes, function (prefix) {\r
                  return prefix.mode === 'o';\r

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