Merge remote-tracking branch 'origin/Channels' into Unstable
Merge branch 'Unstable' of https://github.com/TerryTel93/WebsocketChat into Unstable