.
Merge remote-tracking branch 'origin/master'

Conflicts:
	SCHAS/app/src/main/java/org/geospaces/schas/BluetoothSettings.java