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

Conflicts:
	cacic-teste/cacic-teste.pro
	src/cacic_computer.cpp
	src/cacic_computer.h