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

Conflicts:
	PriceServer/exporta_precos.cpp
	PriceServer/sistema_apc.cpp
a