Merge branch 'feature/hashtag_support'

* feature/hashtag_support:
  hashtag highlighting