work on the heater sub-system
Configuration files
Merge branch 'development' of https://github.com/Technocopia/ServoStock
into development

Conflicts:
	firmware/nbproject/Makefile-genesis.properties