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
Resolve merge conflicts
Small fixes

Green clouds in gridview; double formatting in Calculations.
Fixed invalid int error
Resolve merge conflicts
Discarded head
Merge remote-tracking branch 'origin/Release-version' into Non-fuel-dependent_Release_version
Merge branch 'Non-fuel-dependent_Release_version' of https://github.com/sumayyah/OBDEnergy into Non-fuel-dependent_Release_version

Conflicts:

	obdEnergy/src/main/java/com/example/obdenergy/obdenergy/Activities/DriveFragment.java

	obdEnergy/src/main/java/com/example/obdenergy/obdenergy/Activities/GraphsFragment.java

	obdEnergy/src/main/java/com/example/obdenergy/obdenergy/Activities/MetricFragment.java

	obdEnergy/src/main/java/com/example/obdenergy/obdenergy/MainActivity.java