fixes
accident removal
Merge branch 'iba_93_ability_to_remove_conversation' into staging