ultimas mudancas
Merge branch 'Homologacao2' of https://github.com/tigum27/KondorProject into Homologacao2
finalizando atuplanilha
teste
Merge branch 'Homologacao2' of https://github.com/tigum27/KondorProject into Homologacao2

Conflicts:
	ClientQtReferencias/gerentereferenciasclient.cpp
teste
teste
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao

Conflicts:
	ClientQtReferencias/ClientQtReferencias.pro.user
	ClientQtReferencias/enumsFatoresRisco.h
	ClientQtReferencias/gerentereferenciasclient.cpp
	ClientQtReferencias/onlinefeeder.cpp
	ClientQtw/ClientQtw.pro.user
	ClientQtw/ClientQtw.pro.user.c327061
	ServiceWin/ServiceWin.pro.user
	ServiceWin/config.txt
	ServiceWin/myrunnable.cpp
	ServidorReferencias/ServidorReferencias.pro.user
	TNTFunction_UDF/TNTFunction_UDF.pro.user
	TNTFunctions/TNTFunctions.pro.user
	Utilities/KondorAux/include/KondorAux.pro.user
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao

Conflicts:
	ClientQtReferencias/ClientQtReferencias.pro.user
	ClientQtReferencias/ClientQtReferencias.pro.user.c327061
	ClientQtReferencias/conectorplanilha.cpp
	ClientQtReferencias/enumsFatoresRisco.h
	ClientQtReferencias/gerentereferenciasclient.cpp
	ClientQtReferencias/onlinefeeder.cpp
	ClientQtw/ClientQtw.pro.user
	ClientQtw/ClientQtw.pro.user.1.3
	ClientQtw/ClientQtw.pro.user.c327061
	ServiceWin/config.txt
	ServiceWin/myrunnable.cpp
	TNTFunction_UDF/TNTFunction_UDF.pro.user
	TNTFunctions/TNTFunctions.pro.user
	Utilities/KondorAux/include/KondorAux.pro.user