* update snapshots to only compare against the elements and not the bloated objects * resolve conflicts to master
* Fix version of commonmark-react-renderer in package.json
* MM-10273 Add hashtag support * Put hashtag search in a proper modal * Change hashtag search style to match regular search * Move Hashtag component and explicitly pass props * Add unit tests for Hashtag component * Fix merge conflict
