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

Conflicts:
	ClientQtReferencias/Debug/moc_arvore_cr.cpp
	ClientQtReferencias/Debug/moc_fatorriscointerpolado.cpp
	ClientQtReferencias/Debug/moc_rpcclientplanilha.cpp
	TNTFunctions/Debug/moc_qinstrument.cpp
	Utilities/KondorAux/include/Debug/moc_configerbd.cpp
	Utilities/KondorAux/include/Debug/moc_ktimer.cpp
	Utilities/KondorAux/include/Debug/moc_observador.cpp
	Utilities/KondorAux/include/Debug/moc_sleeper.cpp
	Utilities/KondorAux/include/Debug/moc_ttimer.cpp
	Utilities/KondorAux/include/Debug/moc_windowwaiter.cpp
	importauniversal/importauniversal.pro.user