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

Conflicts:
	testeInter/kwebloc.cpp
	testeInter/main.cpp
	testeInter/testeInter.pro.user
	testeInter/testemapeamento.cpp
mysql backup
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao

Conflicts:
	AtualizadorServer/AtualizadorServer.pro.user.1.3
	ClientQtw/ClientQtw.pro.user.1.3
	Utilities/KondorAux/include/KondorAux.pro.user.1.3