Minor changes to AdministrativeEJB
Merging conflicts.
LandUseType undelete.