Merged

Conflicts:
	docs.html
	notes/figures.html
	notes/rpi_usb_ethernet_gateway.html