Merge branch 'dev' of https://gitlab-public.quanti.cz/humansis/mobile-apps/user-app into release/v3.5.1

 Conflicts:
	build.gradle
	settings.gradle