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

Conflicts:
	testeInter/kwebloc_split.h
	testeInter/testeInter.pro
	testeInter/testeInter.pro.user