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

Conflicts:
	PriceServer/sistema_apc_structs.hpp
Merge branch 'Homologacao' of github.com:tigum27/KondorProject into Homologacao