tudo
tudo
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao

Conflicts:
	AtualizadorSites-Client/AtualizadorSites-Client.pro.user
	KondorServiceManager/KondorServiceManager.pro.user.1.3
	Mapeador/Mapeador.pro.user
a
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao

Conflicts:
	AtualizadorSites-Client/AtualizadorSites-Client.pro.user
	AtualizadorSites-Client/AtualizadorSites-Client.pro.user.1.3
	AtualizadorSites-Client/AtualizadorSites-Client.pro.user.88aeb73
	Mapeador/Mapeador.pro.user
	Mapeador/Mapeador.pro.user.88aeb73
	PriceServer/exporta_precos.h
	activeqt/activeqt.pro.user.88aeb73
oi