Move ASL & status tracking to a new branch
Move ASL & status tracking to a new branch
Rollback
Remove a plugin that's not in the right branch
Add setting to switch between 12 and 24 hour timestamps

Resolves #282
Adding panel_access to the application model for tracking tab history
Merge remote-tracking branch 'upstream/development' into development
Replace calls to console.log() with Winston.info() etc.
Make the '#' optional in join command
Cleaner way for making channel prefix optional in join command
Optional param[0] in PART message
Client: /part command fix
Missed line from previous commit
Merge branch 'fixes' of https://github.com/CoryChaplin/KiwiIRC into CoryChaplin-fixes
channel_prefix may contain more than one prefix
Merge branch 'timestamp' of https://github.com/M2Ys4U/KiwiIRC into M2Ys4U-timestamp

Conflicts:
	client/src/views/channel.js
Correctly showing 0 hours in 12 hour timestamps
Switch chanlist from an id to a css class
Tracking the active panel correctly
Correctly checking if active panel != applet before scrolling down