Removed reference to unused src/main/webapp
Merge branch 'maintenance' of github.com:bedatadriven/activityinfo into maintenance
Improved parent-matching algorithm in geometry importer