OK add

OK add
add3
Merge branch 'master' of https://github.com/yaozhihang/PlayPool

Conflicts:
	Oracle/SQLScripts/oracle_spatial/.project
	Oracle/SQLScripts/oracle_spatial/CREATE_DB2.sql
	Oracle/SQLScripts/oracle_spatial/CREATE_GEODB_PKG.sql
	Oracle/SQLScripts/oracle_spatial/CREATE_PLANNING_MANAGER.sql
	Oracle/SQLScripts/oracle_spatial/DISABLE_VERSIONING.sql
	Oracle/SQLScripts/oracle_spatial/DROP_DB.sql
	Oracle/SQLScripts/oracle_spatial/DROP_GEODB_PKG.sql
	Oracle/SQLScripts/oracle_spatial/DROP_PLANNING_MANAGER.sql
	Oracle/SQLScripts/oracle_spatial/ENABLE_VERSIONING.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_CITYMODELASPECT_PROCEDUREBODYS.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_CITYMODELASPECT_PROCEDURES.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_CONSTRAINTS.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_PLANNINGALTERNATIVE_PROCEDUREBODYS.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_PLANNINGALTERNATIVE_PROCEDURES.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_PLANNING_PROCEDUREBODYS.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_PLANNING_PROCEDURES.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_SPATIAL_INDEX.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_TABLES.sql
	Oracle/SQLScripts/oracle_spatial/PLANNING_MANAGER/CREATE_UTIL_PROCEDURES.sql
	Oracle/SQLScripts/oracle_spatial/PL_SQL/GEODB_PKG/DELETE/DELETE.sql
	Oracle/SQLScripts/oracle_spatial/PL_SQL/GEODB_PKG/INDEX/IDX.sql
	Oracle/SQLScripts/oracle_spatial/PL_SQL/GEODB_PKG/MATCHING/MATCH.sql
	Oracle/SQLScripts/oracle_spatial/PL_SQL/GEODB_PKG/MATCHING/MERGE.sql
	Oracle/SQLScripts/oracle_spatial/PL_SQL/GEODB_PKG/STATISTICS/STAT.sql
	Oracle/SQLScripts/oracle_spatial/PL_SQL/GEODB_PKG/UTIL/UTIL.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/CONSTRAINTS/CONSTRAINTS.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/INDEXES/SIMPLE_INDEX.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/INDEXES/SPATIAL_INDEX.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/ADDRESS_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/APPEARANCE_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/CITYMODEL_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/CITYOBJECT_GENERICATT_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/CITYOBJECT_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/EXTERNAL_REF_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/IMPLICIT_GEOMETRY_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/RASTER_REL_GEORASTER_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/RASTER_REL_GEORST_RDT_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/SURFACE_DATA_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/SURFACE_GEOMETRY_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/SEQUENCES/TEX_IMAGE_SEQ.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/APPEARANCE/APPEARANCE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/APPEARANCE/APPEAR_TO_SURFACE_DATA.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/APPEARANCE/SURFACE_DATA.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/APPEARANCE/TEXTUREPARAM.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/APPEARANCE/TEX_IMAGE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BRIDGE/ADDRESS_TO_BRIDGE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BRIDGE/BRD_CONSTR_ELEMENT.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BRIDGE/BRD_OPEN_TO_THEM_SURFACE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BRIDGE/BRD_THEMATIC_SURFACE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BRIDGE/BRIDGE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BRIDGE/BRIDGE_FURNITURE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BRIDGE/BRIDGE_INSTALLATION.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BRIDGE/BRIDGE_OPENING.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BRIDGE/BRIDGE_ROOM.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BUILDING/ADDRESS.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BUILDING/ADDRESS_TO_BUILDING.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BUILDING/BUILDING.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BUILDING/BUILDING_FURNITURE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BUILDING/BUILDING_INSTALLATION.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BUILDING/OPENING.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BUILDING/OPENING_TO_THEM_SURFACE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BUILDING/ROOM.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/BUILDING/THEMATIC_SURFACE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/CITYFURNITURE/CITY_FURNITURE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/CITYOBJECTGROUP/CITYOBJECTGROUP.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/CITYOBJECTGROUP/GROUP_TO_CITYOBJECT.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/CORE/CITYMODEL.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/CORE/CITYOBJECT.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/CORE/CITYOBJECT_MEMBER.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/CORE/EXTERNAL_REFERENCE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/CORE/GENERALIZATION.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/CORE/IMPLICIT_GEOMETRY.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/GENERICS/CITYOBJECT_GENERICATTRIB.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/GENERICS/GENERIC_CITYOBJECT.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/GEOMETRY/SURFACE_GEOMETRY.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/LANDUSE/LAND_USE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/METADATA/DATABASE_SRS.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/METADATA/OBJECTCLASS.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/RELIEF/BREAKLINE_RELIEF.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/RELIEF/MASSPOINT_RELIEF.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/RELIEF/RASTER_RELIEF.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/RELIEF/RASTER_RELIEF_GEORASTER.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/RELIEF/RASTER_REL_GEORASTER_RDT.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/RELIEF/RELIEF_COMPONENT.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/RELIEF/RELIEF_FEATURE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/RELIEF/RELIEF_FEAT_TO_REL_COMP.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/RELIEF/TIN_RELIEF.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/TRANSPORTATION/TRAFFIC_AREA.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/TRANSPORTATION/TRANSPORTATION_COMPLEX.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/TUNNEL/TUNNEL.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/TUNNEL/TUNNEL_FURNITURE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/TUNNEL/TUNNEL_HOLLOWSPACE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/TUNNEL/TUNNEL_INSTALLATION.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/TUNNEL/TUNNEL_OPENING.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/TUNNEL/TUNNEL_OPEN_TO_THEM_SURF.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/TUNNEL/TUNNEL_THEMATIC_SURFACE.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/VEGETATION/PLANT_COVER.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/VEGETATION/SOLITARY_VEGETAT_OBJECT.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/WATERBODY/WATERBODY.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/WATERBODY/WATERBOD_TO_WATERBND_SRF.sql
	Oracle/SQLScripts/oracle_spatial/SCHEMA/TABLES/WATERBODY/WATERBOUNDARY_SURFACE.sql
	Oracle/SQLScripts/oracle_spatial/UTIL/CREATE_DB/DO_NOTHING.sql
	Oracle/SQLScripts/oracle_spatial/UTIL/CREATE_DB/HINT_ON_MISSING_SRS.sql
	Oracle/SQLScripts/oracle_spatial/UTIL/CREATE_DB/OBJECTCLASS_INSTANCES.sql
	Oracle/SQLScripts/oracle_spatial/UTIL/RO_USER/CREATE_RO_USER.sql
	Oracle/SQLScripts/oracle_spatial/UTIL/SRS/SOLDNER_BERLIN_SRS.sql