Obligatoria la union y simplificacion de subparcelas rusticas
Merge branch 'master' of https://github.com/AnderPijoan/cat2osm2

Conflicts:
	cat2osm2.jar