CURRENT
Merge branch 'fixes'

Conflicts:
	lib/dispatch/dispatch.ex
	lib/dispatch/dispatch_server.ex
	lib/hw.ex