Optimized PowerUser
CSVDumper
Merge branch 'kivifix'

Conflicts:
	src/main/java/fi/paivola/mapserver/App.java