merge
Merge branch 'master' of https://github.com/lightbase/cacic-agente

Conflicts:
	src/cacic_comm.h