chat screen changes
Merge branch 'master' of https://github.com/Kikaimaru/GrindFest.git
fixed modal dialogs
Merge branch 'master' of https://github.com/Kikaimaru/GrindFest.git