Rough outline of DIYPS functions with refactored carb algorithms
Merge latest nightscout:dev into wip/iob-cob
Merge branch 'wip/iob-cob' of https://github.com/nightscout/cgm-remote-monitor into nightscout-wip/iob-cob

Conflicts:
	static/js/client.js
Merge branch 'nightscout-wip/iob-cob' into wip/iob-cob
process calData, and filtered/unfiltered/rssi fields in cgmData
define and actually use calData
put cal records at the end of the patientData array, and don't check them in is_different
typofix
use Cookie cal records for rawBg
Merge pull request #217 from scottleibrand/wip/iob-cob

Display rawBGs based on cookie uploader calibration records