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

Conflicts:
	ClientQtReferencias/ClientQtReferencias.pro.user
	ClientQtw/ClientQtw.pro
	ClientQtw/ClientQtw.pro.user
	ClientQtw/main.cpp
	ClientQtw/painelconectores.h
	KondorServiceManager/KondorServiceManager.pro.user
	ServiceWin/ServiceWin.pro.user
	Utilities/KondorAux/include/KondorAux.pro.user
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao
teste
a
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao

Conflicts:
	ClientQtReferencias/ClientQtReferencias.pro.user.1.3
	ClientQtw/ClientQtw.pro.user.1.3
	KondorServiceManager/KondorServiceManager.pro.user.1.3
Subindo clientqt
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao

Conflicts:
	ClientQtReferencias/ClientQtReferencias.pro.user
	ClientQtw/ClientQtw.pro.user
	ClientQtw/mainwindow.cpp
	ClientQtw/mainwindow.h
	KondorServiceManager/KondorServiceManager.pro.user
	ServiceWin/ServiceWin.pro.user
	Utilities/KondorAux/include/KondorAux.pro.user