Merge branch 'upstream-edge' into zmorph-edge-multitool

Conflicts:
	src/modules/robot/Block.cpp
added script for deploying firmare onto the machine
Merge branch 'multitool' into edge