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

Conflicts:
	cacic-daemon/cacicD/cacicD.pro
	cacic-daemon/cacicD/cacicD.pro.user