update license headers
replace old geo location code with infoserviceclient
merge