Merge pull request #399 from Smoothieware/edge

stable edge before multitool
update firmware.bin fir master
Merge branch 'edge'

Conflicts:
	FirmwareBin/firmware.bin
Merge remote-tracking branch 'upstream/master' into edge

Conflicts:
	FirmwareBin/firmware.bin