Improved empty chat room message
Merge remote-tracking branch 'origin/master' into TylersBranch
Tyler Added a cancel button to the draw screen