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

Conflicts:
	ClientQtReferencias/ClientQtReferencias.pro
	ClientQtReferencias/bloomberg.h
	Utilities/KondorAux/include/rpcclientbase.h
commit
Merge branch 'Homologacao2' of https://github.com/tigum27/KondorProject into Homologacao2
Merge branch 'Homologacao2' of https://github.com/tigum27/KondorProject into Homologacao2

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

Conflicts:
	ClientQtReferencias/main.cpp
	ClientQtReferencias/onlinefeeder.h
manager