><>
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/galileo/bmp/Visualization.java
	src/galileo/client/Benchmark_Query.java
	src/galileo/client/Benchmark_Sample.java
	src/galileo/client/Benchmark_Store.java
	src/galileo/client/Data.java
	src/galileo/client/EventPublisher.java
	src/galileo/client/GraphTest.java
	src/galileo/client/OldTextClient.java
	src/galileo/client/TextClientWithRdf.java
	src/galileo/client/package-info.java
	src/galileo/client/rdftraverse/button/RDFChildButton.java
	src/galileo/client/rdftraverse/main/RdfTraverser.java
	src/galileo/client/rdftraverse/panel/MainPanel.java
	src/galileo/client/rdftraverse/panel/PathElement.java
	src/galileo/client/rdftraverse/panel/RDFPanel.java
	src/galileo/client/rdftraverse/rdf/RDFUtils.java
	src/galileo/comm/Disconnection.java
	src/galileo/comm/Query.java
	src/galileo/comm/QueryPreamble.java
	src/galileo/comm/QueryRequest.java
	src/galileo/comm/QueryResponse.java
	src/galileo/comm/Sample.java
	src/galileo/comm/SampleResponse.java
	src/galileo/comm/StorageEvent.java
	src/galileo/comm/StorageRequest.java
	src/galileo/comm/package-info.java
	src/galileo/config/SystemConfig.java
	src/galileo/config/package-info.java
	src/galileo/dataset/BlockArray.java
	src/galileo/dataset/BlockMetadata.java
	src/galileo/dataset/BlockType.java
	src/galileo/dataset/Bookmark.java
	src/galileo/dataset/Coordinates.java
	src/galileo/dataset/DatasetException.java
	src/galileo/dataset/DatasetGraph.java
	src/galileo/dataset/Device.java
	src/galileo/dataset/DeviceSet.java
	src/galileo/dataset/Feature.java
	src/galileo/dataset/FeatureSet.java
	src/galileo/dataset/FeatureType.java
	src/galileo/dataset/FeatureValue.java
	src/galileo/dataset/FileBlock.java
	src/galileo/dataset/MetaArray.java
	src/galileo/dataset/NullFeature.java
	src/galileo/dataset/Point.java
	src/galileo/dataset/RuntimeMetadata.java
	src/galileo/dataset/SpatialProperties.java
	src/galileo/dataset/SpatialRange.java
	src/galileo/dataset/TemporalProperties.java
	src/galileo/dataset/TemporalRange.java
	src/galileo/dataset/TemporalRangeImpl.java
	src/galileo/dataset/Views.java
	src/galileo/dataset/package-info.java
	src/galileo/dht/EventHandler.java
	src/galileo/dht/GroupInfo.java
	src/galileo/dht/NetworkConfig.java
	src/galileo/dht/NetworkInfo.java
	src/galileo/dht/NetworkManager.java
	src/galileo/dht/NodeArray.java
	src/galileo/dht/NodeInfo.java
	src/galileo/dht/PartitionException.java
	src/galileo/dht/Partitioner.java
	src/galileo/dht/ProcessingUnit.java
	src/galileo/dht/QueryTracker.java
	src/galileo/dht/QueueScheduler.java
	src/galileo/dht/SHA1Partitioner.java
	src/galileo/dht/SampleHandler.java
	src/galileo/dht/Scheduler.java
	src/galileo/dht/SpatialHierarchyPartitioner.java
	src/galileo/dht/StorageNode.java
	src/galileo/dht/hash/BalancedHashRing.java
	src/galileo/dht/hash/ConstrainedGeohash.java
	src/galileo/dht/hash/HashException.java
	src/galileo/dht/hash/HashFunction.java
	src/galileo/dht/hash/HashRing.java
	src/galileo/dht/hash/HashRingEntry.java
	src/galileo/dht/hash/HashTopologyException.java
	src/galileo/dht/hash/SHA1.java
	src/galileo/dht/hash/SpatialHash.java
	src/galileo/dht/hash/TinyHash.java
	src/galileo/dht/hash/package-info.java
	src/galileo/dht/package-info.java
	src/galileo/event/EventContainer.java
	src/galileo/event/EventListener.java
	src/galileo/event/EventType.java
	src/galileo/event/GalileoEvent.java
	src/galileo/event/HandlesEvent.java
	src/galileo/event/package-info.java
	src/galileo/fs/FileSystem.java
	src/galileo/fs/FileSystemException.java
	src/galileo/fs/Journal.java
	src/galileo/fs/ReplicationManager.java
	src/galileo/fs/package-info.java
	src/galileo/galilei/Galilei.java
	src/galileo/galilei/GalileiParser.java
	src/galileo/galilei/GalileoScriptParser.java
	src/galileo/galilei/GalileoScriptParserConstants.java
	src/galileo/galilei/GalileoScriptParserTokenManager.java
	src/galileo/galilei/ParseException.java
	src/galileo/galilei/SimpleCharStream.java
	src/galileo/galilei/Token.java
	src/galileo/galilei/TokenMgrError.java
	src/galileo/graph/CollectorVertex.java
	src/galileo/graph/GraphException.java
	src/galileo/graph/HierarchicalGraph.java
	src/galileo/graph/HierarchicalQueryTracker.java
	src/galileo/graph/LogicalGraph.java
	src/galileo/graph/LogicalGraphNode.java
	src/galileo/graph/Path.java
	src/galileo/graph/PhysicalGraph.java
	src/galileo/graph/Vertex.java
	src/galileo/graph/package-info.java
	src/galileo/logging/GalileoFormatter.java
	src/galileo/logging/package-info.java
	src/galileo/net/ClientConnectionPool.java
	src/galileo/net/ClientMessageRouter.java
	src/galileo/net/GalileoMessage.java
	src/galileo/net/HostIdentifier.java
	src/galileo/net/MessageListener.java
	src/galileo/net/MessageRouter.java
	src/galileo/net/NetworkDestination.java
	src/galileo/net/PortTester.java
	src/galileo/net/ServerMessageRouter.java
	src/galileo/net/TransmissionTracker.java
	src/galileo/net/package-info.java
	src/galileo/query/Expression.java
	src/galileo/query/Operation.java
	src/galileo/query/Operator.java
	src/galileo/query/Query.java
	src/galileo/query/package-info.java
	src/galileo/rdf/MetaDataGraph.java
	src/galileo/replication/NeighborTest.java
	src/galileo/replication/NeighborTest2.java
	src/galileo/replication/package-info.java
	src/galileo/sampling/GalileoSampleInterface.java
	src/galileo/sampling/SimpleRandomSample.java
	src/galileo/sampling/TemporalStratifiedSample.java
	src/galileo/sampling/package-info.java
	src/galileo/serialization/ByteSerializable.java
	src/galileo/serialization/SerializableArray.java
	src/galileo/serialization/SerializationException.java
	src/galileo/serialization/SerializationInputStream.java
	src/galileo/serialization/SerializationOutputStream.java
	src/galileo/serialization/Serializer.java
	src/galileo/serialization/package-info.java
	src/galileo/test/Graph.java
	src/galileo/test/JarTest.java
	src/galileo/test/ReadData.java
	src/galileo/util/Checksum.java
	src/galileo/util/FileNames.java
	src/galileo/util/GeoHash.java
	src/galileo/util/JarInvoker.java
	src/galileo/util/LoggedPerformanceTimer.java
	src/galileo/util/Pair.java
	src/galileo/util/PerformanceTimer.java
	src/galileo/util/StatusLine.java
	src/galileo/util/Version.java
	src/galileo/util/package-info.java