Fixed various chat issues, made chat scroll
Merge remote-tracking branch 'origin/master'