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

Conflicts:
	testeInter/testeInter.pro.user
um zilhao
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao

Conflicts:
	TNTFunctions/TNTFunctions.pro.user.1.3
	Utilities/KondorAux/include/KondorAux.pro
	Utilities/KondorAux/include/KondorAux.pro.user.1.3
	testeInter/testeInter.pro.user