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

Conflicts:
	ClientQtw/ClientQtw.pro.user.1.3
	KondorServiceManager/KondorServiceManager.pro.user.1.3
	PriceServer/PriceServer.pro.user.1.3
	Utilities/KondorAux/include/KondorAux.pro.user.1.3
	importauniversal/importauniversal.h
	importauniversal/importauniversal.pro.user
a