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

Conflicts:
	ClientQtReferencias/ClientQtReferencias.pro.user
	ClientQtw/ClientQtw.pro.user
	KondorServiceManager/KondorServiceManager.pro.user
	PriceServer/PriceServer.pro.user
	Utilities/KondorAux/include/KondorAux.pro.user