style overhaul and major refactor
Merge remote-tracking branch 'origin/master' into NoTicket-overhaul-of-dexdrp-visuals-and-calibration-refiltering

Conflicts:
	app/src/main/AndroidManifest.xml
	app/src/main/java/com/eveningoutpost/dexdrip/AddCalibration.java
	app/src/main/java/com/eveningoutpost/dexdrip/FakeNumbers.java
	app/src/main/java/com/eveningoutpost/dexdrip/Models/BgReading.java
	app/src/main/java/com/eveningoutpost/dexdrip/Services/DexCollectionService.java
Merge pull request #3 from StephenBlackWasAlreadyTaken/NoTicket-overhaul-of-dexdrp-visuals-and-calibration-refiltering

style overhaul and major refactor