- improve teh chat
- improve teh ui of chat
Merge branch 'master' into develop