adding a new thermistor
Merge remote-tracking branch 'upstream/edge' into vikilcd