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

Conflicts:
	AtualizadorViewer/AtualizadorViewer.pro.user
	AtualizadorViewer/linhaatualizador.h
	AtualizadorViewer/main.cpp
a
Criaçao tela.
Merge branch 'Homologacao' of https://github.com/tigum27/KondorProject into Homologacao