Merge branch 'addMessages' of https://github.com/dotZak/chattr into dotZak-addMessages
Merge branch 'dotZak-addMessages'
Merge remote-tracking branch 'upstream/master'
fixed delete chatroom button
Merge pull request #5 from dotZak/fixDeleteButton

Fix delete button