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

Conflicts:
	testeInter/testeInter.pro.user
wbloc mudancas
teste