Feat/multiple layer featureinfo

Some changes to allow WMS getFeatureInfo for multiple layers in 1 service layer