Merged
Improved team chat :D