unbreak master
Merge branch 'master' into jebeck/nurse-shark

Conflicts:
	example/data/device-data.json
	js/validation/basal.js