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

Conflicts:
	AtualizadorSites-Client/AtualizadorSites-Client.pro.user
	Mapeador/Mapeador.pro.user