# Conflicts:
#	app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt
#	app/src/main/java/chat/rocket/android/authentication/resetpassword/ui/ResetPasswordFragment.kt
#	app/src/main/java/chat/rocket/android/authentication/server/ui/ServerFragment.kt
#	app/src/main/java/chat/rocket/android/authentication/signup/ui/SignupFragment.kt
#	app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt
#	app/src/main/java/chat/rocket/android/util/extensions/Animation.kt
#	app/src/main/java/chat/rocket/android/util/extensions/Ui.kt

merge

[FIX] View less/view more button getting lost

[NEW] Redesign authentication views

merge

[FIX] Two factor authentication when using email.

[NEW] Add room_privacy_changed system message handling

merge

[FEATURE] Initial message db support

Revert "[PROJECT] Bump Android gradle plugin to 3.2.0 stable version"

 To be improved soon.

To make it better on some densities.

merge