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

Conflicts:
	PriceServer/PriceServer.pro.user.1.3
	TNTFunctions/TNTFunctions.pro.user.1.3