# Conflicts:
#	app/src/main/java/chat/rocket/android/authentication/login/ui/LoginFragment.kt
#	app/src/main/java/chat/rocket/android/authentication/presentation/AuthenticationNavigator.kt
#	app/src/main/java/chat/rocket/android/authentication/twofactor/ui/TwoFAFragment.kt
#	app/src/main/java/chat/rocket/android/authentication/ui/AuthenticationActivity.kt
#	app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
#	app/src/main/res/layout/fragment_authentication_log_in.xml
#	app/src/main/res/layout/fragment_profile.xml
#	app/src/main/res/menu/navigation.xml
#	app/src/main/res/values-de/strings.xml
#	app/src/main/res/values-es/strings.xml
#	app/src/main/res/values-fr/strings.xml
#	app/src/main/res/values-hi-rIN/strings.xml
#	app/src/main/res/values-pt-rBR/strings.xml
#	app/src/main/res/values-ru/strings.xml
#	app/src/main/res/values/strings.xml
#	build.gradle

merge

[FIX] Building error

merge

Down backing to 3.3.0-alpha05 due to a bug related with HandlerContext error. Fix wrong importing package.

Revert "[FIX] Temporary workaround for HandlerContext error."

merge

[NEW] Analytics for Answer (Fabric).

layout_avatar duplicate removed

merge

[FIX] Temporary workaround for HandlerContext error.

Fix file size validation for drawing image.

Taking care of not using Answers on FOSS version as well as only tracking if user has enabled the tracking.

layout_avatar duplicated in the layout

merge

[FIX] File size validation

merge

[NEW] Permission list

[NEW] Adds the admin panel.