update login & welcome
Merge branch 'master' into update

Conflicts:
	LostAndFound/src/main/AndroidManifest.xml
	build/intermediates/dex-cache/cache.xml
	build/intermediates/model_data.bin