Merge remote-tracking branch 'origin/master' into Release-version

Conflicts:

	obdEnergy/src/main/java/com/example/obdenergy/obdenergy/Utilities/BluetoothChatService.java
	obdenergy.keystore.release.jks