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

Conflicts:
	client/src/views/channel.js

diff --cc client/assets/themes/relaxed/style.css
Simple merge

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

diff --cc client/src/views/channel.js
index 28498defb9183fa0e51db426df2c79ee47df93f8,df9d31556e2c3b30a65f3a73029fd4cff33b17a6..ced59fc7eb2456d1f05c5e6b7e7f77e64055a688
--- 1/client/src/views/channel.js
--- 2/client/src/views/channel.js
+++ b/client/src/views/channel.js
@@@ -59,7 -59,7 +59,7 @@@ _kiwi.view.Channel = _kiwi.view.Panel.e
              time_difference,
              sb = this.model.get('scrollback'),
              prev_msg = sb[sb.length-2],
-             network;
 -            hour, pm;
++            network, hour, pm;
  
          // Nick highlight detecting
          if ((new RegExp('(^|\\W)(' + escapeRegex(_kiwi.app.connections.active_connection.get('nick')) + ')(\\W|$)', 'i')).test(msg.msg)) {