Merge remote branch 'origin/development' into text_themes
Merge branch 'development' of https://github.com/CoryChaplin/KiwiIRC into text_themes
TextTheme view removed
Merge pull request #21 from prawnsalad/CoryChaplin-text_themes

TextTheme view removed
Don't specify the textTheme params within its regex
Merge branch 'text_themes' of https://github.com/CoryChaplin/KiwiIRC into CoryChaplin-text_themes
Shortening text_theme keys
Merge pull request #22 from prawnsalad/CoryChaplin-text_themes

text_theme keys shortening
Remove view/output related data from member model
member.js formatting + comment
Removing text theme formatting chars from application code; Use more-readable names instead of single chars for text theming
Updating text themes with new %var names
Merge pull request #23 from prawnsalad/CoryChaplin-text_themes

Cory chaplin text themes
Don't automatically give focus when within an iframe
Merge branch 'development' of https://github.com/CoryChaplin/KiwiIRC into fixes
Client transports within config.js
Using Negotiator for accept-language parsing
Merge remote-tracking branch 'origin/development' into CoryChaplin-text_themes

* origin/development: (23 commits)
  Using Negotiator for accept-language parsing
  Client transports within config.js
  Don't automatically give focus when within an iframe
  MenuBox now a public component
  Startup applet correctly showing the info box
  Build script fix #531
  Missed HTML template update from previous commit
  Moving nick list toggle into the right bar
  More format adjustment :)
  Adjusted code format
  Added inspircd 396 numeric RPL_HOSTCLOACKING
  Extracting the right_bar into its own view with toggling logic
  using the .disabled CSS class when toggling right_bar
  Kiwi API: addMediaMessageType()
  Separating formatDate + only init'ing its vars once
  Date format language files
  Adding date.format to make date strings customisable to fit your locale
  Add visible check for updating banlist
  fix indentation (I should really have checked the diff better >_>)
  remove useless show
  ...

Conflicts:
	client/build.js
	server/settingsgenerator.js
'symbols' text theme now the default
Loading text theme tidy up