clientbase
conectorplanilha.cpp
Merge branch 'Homologacao2' of https://github.com/tigum27/KondorProject into Homologacao2

Conflicts:
	ClientQtReferencias/bloomberg.cpp
	ClientQtReferencias/bloomberg_request.cpp
	ClientQtReferencias/onlinefeeder.cpp
	ServiceWin/ServiceWin.pro.user
	Utilities/KondorAux/include/KondorAux.pro.user
	Utilities/KondorAux/include/rpcclientbase.h
teste
Merge branch 'Homologacao2' of https://github.com/tigum27/KondorProject into Homologacao2

Conflicts:
	ServiceWin/ServiceWin.pro.user
	ServidorReferencias/ServidorReferencias.pro.user
	Utilities/Conector/include/Conector.pro.user
	Utilities/KondorAux/include/KondorAux.pro.user
mundaca clientreferencia
Merge branch 'Homologacao2' of https://github.com/tigum27/KondorProject into Homologacao2

Conflicts:
	ClientQtReferencias/ClientQtReferencias.pro
	ClientQtReferencias/gerentereferenciasclient.cpp
	ClientQtReferencias/rpcservermanager.cpp
	ClientQtReferencias/rpcservermanager.h
commit
Merge branch 'Homologacao2' of https://github.com/tigum27/KondorProject into Homologacao2