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

Conflicts:
	PriceServer/exporta_precos.cpp
	TNTFunctions/cds.cpp
	TNTFunctions/cds.h