testikattavuuden paranteluyritys
Merge branch 'noora'

Conflicts:
	app/src/main/java/app/contacts/QRScanResultHandler.java
	app/src/main/java/app/preferences/SettingsFragment.java