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

Conflicts:
	ResultadoOnline/roconnector.cpp
a