Merge branch 'master' into marty
Merge branch 'master' into marty
Added Phone and Email to Customer JSON, retrieving MeasurementId, cleaned up some autocorrect stuff with textfield
Merge branch 'marty' - resolved conflicts

Conflicts:
	main.wire