Channels user counter
Merge branch 'feature_user_count' of https://github.com/CoryChaplin/KiwiIRC into CoryChaplin-feature_user_count
Merging the user counts element into member list view
Merge branch 'CoryChaplin-feature_user_count' into development

Conflicts:
	client/assets/themes/relaxed/style.css
Merge branch 'development' of github.com:prawnsalad/KiwiIRC into development

# By tonymke
# Via tonymke (4) and Darren (1)
* 'development' of github.com:prawnsalad/KiwiIRC:
  Do not highlight the user's own messages/actions.
  Send nick with messages to channels.
Merge remote branch 'KiwiIRC/development' into development