Added an x button next to tags to reset sorting and tag filteringin the admin dashboard for conversations conflicts fixed#313

MsVivienne wants to merge 2 commits intoDembrane:mainDembrane/echo:mainfrom

MsVivienne:Added-an-X-button-next-to-Tags-to-reset-sorting-and-tag-filteringin-the-admin-dashboard-for-conversations-conflicts-fixedMsVivienne/echo:Added-an-X-button-next-to-Tags-to-reset-sorting-and-tag-filteringin-the-admin-dashboard-for-conversations-conflicts-fixedCopy head branch name to clipboard