Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	app/src/main/java/com/example/android_hit/MainActivity.kt
#	app/src/main/res/layout/fragment_scan.xml
#	app/src/main/res/layout/fragment_settings.xml