adaptions to the pop converter
changes to the teleatlas converter to fit the aa requirenments
additional merge method
code cleanup, removed unused or duplicate imports.
merged r11089 from branch "release-spring2010" into trunk, containing release-building functionality
adding new class with test.
method renamed.
code cleanup, make sure tests write output to correct directory.
add GPL header