Added CommonConsumption queries, substituting the NationConsumption query
Added upload script
Added upload script
Fixed upload script merge fail