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

Conflicts:
	cacic-teste/cacic-teste.pro
	cacic-teste/testcacic.cpp
	gercols/gercols.cpp
Merge branch 'master' of https://github.com/lightbase/cacic-agente

Conflicts:
	cacic-daemon/cacicD/cacicthread.cpp
	gercols/gercols.cpp