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

Conflicts:
	KondorServiceManager/KondorServiceManager.pro.user
	Utilities/KondorAux/include/KondorAux.pro.user