# Conflicts:
#	app/build.gradle
#	app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
#	app/src/main/res/values-hi-rIN/strings.xml
#	settings.gradle

merge

[FIX] Member, Pinned, Favorite and File list not showing bug.

[IMPROVEMENT] Uses framework's Bottomsheet

[NEW] Allow room names whit special chars

[NEW] Set user agent

[IMPROVEMENT] About activity to fragment

merge

Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into new/allow-room-names-whit-special-chars

[NEW] Favorite/Unfavorite chatroom

merge

[PROJECT] Move out whole emoji codebase to a separate module

merge

[IMPROVEMENT] Quote bar redesign and set it to open even if offline 

Merge branch 'project/emoji-as-a-module' of github.com:RocketChat/Rocket.Chat.Android into project/emoji-as-a-module