finished changeover to popdata
Merge pull request #162 from karinlag/2013-07-oslo

finished changeover to popdata