Alguma observações, não deu tempo de arrumar todas
Merge branch 'master' of https://github.com/lightbase/cacic-agente

Conflicts:
	cacic-daemon/cacicD/cacicd.cpp
	cacic-daemon/cacicD/cacictimer.cpp