fixing merge issues
Merge commit '276f6876cdb60baf7bc44c53d1abbdedbdf1e897' into 2.5-to-3.0-merge

Conflicts:
	Raven.Voron/Bundles/Raven.Bundles.Encryption.IndexFileCodec/App.config
	Raven.Voron/Performance.Comparison/FreeDB.Playground/FreeDbQueries.cs
	Raven.Voron/Performance.Comparison/FreeDB.Playground/Program.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison.sln
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/App.config
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/TimeSeries.Playground.csproj
	Raven.Voron/Voron.Benchmark/App.config
	Raven.Voron/Voron.Tests/Bugs/Deletes.cs
	Raven.Voron/Voron.Tests/Bugs/EmptyTree.cs
	Raven.Voron/Voron.Tests/Bugs/FlushingToDataFile.cs
	Raven.Voron/Voron.Tests/Bugs/Isolation.cs
	Raven.Voron/Voron.Tests/Bugs/LargeValues.cs
	Raven.Voron/Voron.Tests/Bugs/MultiAdds.cs
	Raven.Voron/Voron.Tests/Bugs/PageSplitter.cs
	Raven.Voron/Voron.Tests/Bugs/Recovery.cs
	Raven.Voron/Voron.Tests/Bugs/RecoveryMultipleJournals.cs
	Raven.Voron/Voron.Tests/Bugs/Snapshots.cs
	Raven.Voron/Voron.Tests/Bugs/TreeRebalancer.cs
	Raven.Voron/Voron.Tests/MultiValueTree.cs
	Raven.Voron/Voron.Tests/Storage/Batches.cs
	Raven.Voron/Voron.Tests/Storage/Restarts.cs
	Raven.Voron/Voron.Tests/Storage/SplittingVeryBig.cs
	Raven.Voron/Voron.Tests/Storage/VeryBig.cs
	Raven.Voron/Voron.Tests/StorageTest.cs
	Raven.Voron/Voron.Tests/Trees/MultipleTrees.cs
	Raven.Voron/Voron.Tests/Voron.Tests.csproj
	Raven.Voron/Voron.Tryout/Program.cs
	Raven.Voron/Voron/Debugging/DebugStuff.cs
	Raven.Voron/Voron/Impl/Journal/JournalFile.cs
	Raven.Voron/Voron/Impl/Journal/Win32JournalWriter.cs
	Raven.Voron/Voron/Impl/Journal/WriteAheadJournal.cs
	Raven.Voron/Voron/Impl/Paging/AbstractPager.cs
	Raven.Voron/Voron/Impl/Paging/MemoryMappedPager.cs
	Raven.Voron/Voron/Impl/ScratchBufferPool.cs
	Raven.Voron/Voron/Impl/SnapshotReader.cs
	Raven.Voron/Voron/Impl/StorageEnvironmentState.cs
	Raven.Voron/Voron/Impl/Transaction.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs
	Raven.Voron/Voron/Slice.cs
	Raven.Voron/Voron/StorageEnvironment.cs
	Raven.Voron/Voron/Trees/Cursor.cs
	Raven.Voron/Voron/Util/ConcurrentSet.cs
	Raven.Voron/Voron/ValueReader.cs
	Raven.Voron/Voron/Voron.csproj
	Raven.Voron/readme.txt
Merge commit '276f6876cdb60baf7bc44c53d1abbdedbdf1e897' into New3

Conflicts:
	Raven.Voron/Bundles/Raven.Bundles.Encryption.IndexFileCodec/App.config
	Raven.Voron/Performance.Comparison/FreeDB.Playground/FreeDbQueries.cs
	Raven.Voron/Performance.Comparison/FreeDB.Playground/Program.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison.sln
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/App.config
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/TimeSeries.Playground.csproj
	Raven.Voron/Voron.Benchmark/App.config
	Raven.Voron/Voron.Tests/Bugs/Deletes.cs
	Raven.Voron/Voron.Tests/Bugs/EmptyTree.cs
	Raven.Voron/Voron.Tests/Bugs/FlushingToDataFile.cs
	Raven.Voron/Voron.Tests/Bugs/Isolation.cs
	Raven.Voron/Voron.Tests/Bugs/LargeValues.cs
	Raven.Voron/Voron.Tests/Bugs/MultiAdds.cs
	Raven.Voron/Voron.Tests/Bugs/PageSplitter.cs
	Raven.Voron/Voron.Tests/Bugs/Recovery.cs
	Raven.Voron/Voron.Tests/Bugs/RecoveryMultipleJournals.cs
	Raven.Voron/Voron.Tests/Bugs/Snapshots.cs
	Raven.Voron/Voron.Tests/Bugs/TreeRebalancer.cs
	Raven.Voron/Voron.Tests/MultiValueTree.cs
	Raven.Voron/Voron.Tests/Storage/Batches.cs
	Raven.Voron/Voron.Tests/Storage/Restarts.cs
	Raven.Voron/Voron.Tests/Storage/SplittingVeryBig.cs
	Raven.Voron/Voron.Tests/Storage/VeryBig.cs
	Raven.Voron/Voron.Tests/StorageTest.cs
	Raven.Voron/Voron.Tests/Trees/MultipleTrees.cs
	Raven.Voron/Voron.Tests/Voron.Tests.csproj
	Raven.Voron/Voron.Tryout/Program.cs
	Raven.Voron/Voron/Debugging/DebugStuff.cs
	Raven.Voron/Voron/Impl/Journal/JournalFile.cs
	Raven.Voron/Voron/Impl/Journal/Win32JournalWriter.cs
	Raven.Voron/Voron/Impl/Journal/WriteAheadJournal.cs
	Raven.Voron/Voron/Impl/Paging/AbstractPager.cs
	Raven.Voron/Voron/Impl/Paging/MemoryMappedPager.cs
	Raven.Voron/Voron/Impl/ScratchBufferPool.cs
	Raven.Voron/Voron/Impl/SnapshotReader.cs
	Raven.Voron/Voron/Impl/StorageEnvironmentState.cs
	Raven.Voron/Voron/Impl/Transaction.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs
	Raven.Voron/Voron/Slice.cs
	Raven.Voron/Voron/StorageEnvironment.cs
	Raven.Voron/Voron/Trees/Cursor.cs
	Raven.Voron/Voron/Util/ConcurrentSet.cs
	Raven.Voron/Voron/ValueReader.cs
	Raven.Voron/Voron/Voron.csproj
	Raven.Voron/readme.txt
minor
Can compile voron tests in release mode
Removing useless IConfigureHttpListener abstracton.
Better handle on generating sort headers
Merge branch 'master' of https://github.com/ayende/ravendb into 2.5-to-3.0-merge

Conflicts:
	Raven.Client.Embedded/EmbeddedDatabaseCommands.cs
	Raven.Database/Bundles/Replication/Tasks/ReplicationTask.cs
	Raven.Database/Bundles/Versioning/Triggers/VersioningPutTrigger.cs
	Raven.Database/Config/StronglyTypedRavenSettings.cs
	Raven.Database/DocumentDatabase.cs
	Raven.Database/Indexing/IndexStorage.cs
	Raven.Database/Queries/DynamicQueryRunner.cs
	Raven.Database/Server/HttpServer.cs
	Raven.Database/Server/Responders/Databases.cs
	Raven.Database/Server/Responders/Docs.cs
	Raven.Database/Server/Responders/DocsStreams.cs
	Raven.Database/Server/Responders/QueryStreams.cs
	Raven.Database/Smuggler/DataDumper.cs
	Raven.Database/Storage/Esent/SchemaCreator.cs
	Raven.Database/Storage/Esent/SchemaUpdates/Updates/From47To48.cs
	Raven.Smuggler/Program.cs
	Raven.Tests/Indexes/CompiledIndex.cs
	Raven.Tests/Issues/RavenDB_1007.cs
	Raven.Tests/Issues/RavenDB_1379.cs
	Raven.Tests/Storage/GeneralStorage.cs
	Raven.Web/Web.config
Merge branch 'New3' of https://github.com/ayende/ravendb into 2.5-to-3.0-merge

Conflicts:
	Bundles/Raven.Bundles.Tests/UniqueConstraints/Bugs/Troy3.cs
	Bundles/Raven.Bundles.Tests/UniqueConstraints/ExtensionLoadTests.cs
	Bundles/Raven.Client.UniqueConstraints/UniqueConstraintExtensions.cs
	Bundles/Raven.Client.UniqueConstraints/UniqueConstraintsStoreListener.cs
	Bundles/Raven.Client.UniqueConstraints/UniqueConstraintsTypeDictionary.cs
	DefaultConfigs/RavenDb.exe.config
	DefaultConfigs/Web.config
	Raven.Abstractions/Connection/HttpRavenRequest.cs
	Raven.Abstractions/Data/Constants.cs
	Raven.Abstractions/Json/Linq/RavenJToken.cs
	Raven.Abstractions/Smuggler/SmugglerApiBase.cs
	Raven.Client.Embedded/EmbeddableDocumentStore.cs
	Raven.Client.Embedded/EmbeddedBulkInsertOperation.cs
	Raven.Client.Embedded/EmbeddedDatabaseCommands.cs
	Raven.Client.Lightweight/Connection/AdminRequestCreator.cs
	Raven.Client.Lightweight/Connection/Async/AsyncServerClient.cs
	Raven.Client.Lightweight/Connection/ObservableLineStream.cs
	Raven.Client.Lightweight/Document/Async/AsyncDocumentSession.cs
	Raven.Client.Lightweight/Document/AsyncHiLoKeyGenerator.cs
	Raven.Client.Lightweight/Document/DocumentSession.cs
	Raven.Client.Lightweight/Document/ILoaderWithInclude.cs
	Raven.Client.Lightweight/Document/MultiLoaderWithInclude.cs
	Raven.Client.Lightweight/Document/RemoteBulkInsertOperation.cs
	Raven.Client.Lightweight/Extensions/MultiDatabase.cs
	Raven.Client.Lightweight/Extensions/MultiTenancyExtensions.cs
	Raven.Client.Lightweight/Indexes/ExpressionOperatorPrecedenceExtension.cs
	Raven.Client.Lightweight/Shard/ShardedRavenQueryInspector.cs
	Raven.ClusterManager/Properties/AssemblyInfo.cs
	Raven.Database/Bundles/Encryption/Settings/EncryptionSettingsManager.cs
	Raven.Database/Bundles/Expiration/ExpiredDocumentsCleaner.cs
	Raven.Database/Bundles/PeriodicBackups/PeriodicBackupTask.cs
	Raven.Database/Bundles/Replication/Responders/ReplicationLastEtagResponder.cs
	Raven.Database/Bundles/Replication/Tasks/ReplicationStrategy.cs
	Raven.Database/Bundles/Replication/Tasks/ReplicationTask.cs
	Raven.Database/Bundles/Replication/Triggers/AncestryPutTrigger.cs
	Raven.Database/Bundles/SqlReplication/RelationalDatabaseWriter.cs
	Raven.Database/Bundles/Versioning/Triggers/VersioningPutTrigger.cs
	Raven.Database/Data/DynamicQueryMapping.cs
	Raven.Database/DocumentDatabase.cs
	Raven.Database/Impl/DTC/InFlightTransactionalState.cs
	Raven.Database/Indexing/WorkContext.cs
	Raven.Database/Linq/AbstractTransformer.cs
	Raven.Database/Linq/AbstractViewGenerator.cs
	Raven.Database/Linq/Ast/TransformNullCoalescingOperatorTransformer.cs
	Raven.Database/Prefetching/PrefetchingBehavior.cs
	Raven.Database/Queries/DynamicQueryExtensions.cs
	Raven.Database/Server/Controllers/StreamsController.cs
	Raven.Database/Server/HttpServer.cs
	Raven.Database/Server/Responders/Admin/AdminBackup.cs
	Raven.Database/Server/Responders/Admin/AdminDatabases.cs
	Raven.Database/Server/Responders/Admin/AdminRestore.cs
	Raven.Database/Server/Responders/Databases.cs
	Raven.Database/Server/Responders/Docs.cs
	Raven.Database/Server/Responders/DocsStreams.cs
	Raven.Database/Server/Responders/DocumentBatch.cs
	Raven.Database/Server/Responders/Index.cs
	Raven.Database/Server/Responders/QueryStreams.cs
	Raven.Database/Server/Security/Windows/WindowsAuthConfigureHttpListener.cs
	Raven.Database/Smuggler/DataDumper.cs
	Raven.Database/Storage/Esent/SchemaCreator.cs
	Raven.Database/Storage/Esent/SchemaUpdates/Updates/From46To47.cs
	Raven.Database/Storage/Esent/SchemaUpdates/Updates/From47To48.cs
	Raven.Database/Storage/Esent/StorageActions/Documents.cs
	Raven.Database/Storage/Esent/TransactionalStorageConfigurator.cs
	Raven.Database/Storage/IndexDefinitionStorage.cs
	Raven.Database/Storage/Voron/Impl/TableStorage.cs
	Raven.Database/packages.config
	Raven.Server/App.config
	Raven.Setup.CustomActions/Properties/AssemblyInfo.cs
	Raven.Setup/Components/Service/Raven.Server.wxs
	Raven.Setup/Product.wxs
	Raven.Setup/Settings.wxi
	Raven.SimulatedWorkLoad/Properties/AssemblyInfo.cs
	Raven.Smuggler/Program.cs
	Raven.Studio.Html5/App/common/appUrl.js
	Raven.Studio.Html5/App/viewmodels/databases.js
	Raven.Studio.Html5/App/viewmodels/documents.js
	Raven.Studio.Html5/App/viewmodels/statistics.js
	Raven.Studio.Html5/App/viewmodels/userInfo.js
	Raven.Studio/Assets/EmbeddedData/Northwind.dump
	Raven.Studio/Models/DocumentsPageModel.cs
	Raven.Studio/Models/ServerModel.cs
	Raven.Tests.Helpers/RavenTestBase.cs
	Raven.Tests/Bugs/CanPassTypesProperlyToAggregation.cs
	Raven.Tests/Bugs/HierarchicalData.cs
	Raven.Tests/Bugs/IndexingBehavior.cs
	Raven.Tests/Bugs/PatchShouldNotConvertFloatToInteger.cs
	Raven.Tests/Bundles/Replication/Bugs/ReplicatingDanish.cs
	Raven.Tests/Bundles/Replication/ReplicationBase.cs
	Raven.Tests/Indexes/ComplexIndexOnNotAnalyzedField.cs
	Raven.Tests/Indexes/DocumentsToIndex.cs
	Raven.Tests/Indexes/ExpressionOperatorPrecedenceTest.cs
	Raven.Tests/Indexes/LinqIndexesFromClient.cs
	Raven.Tests/Indexes/QueryingOnDefaultIndex.cs
	Raven.Tests/Indexes/QueryingOnStaleIndexes.cs
	Raven.Tests/Indexes/Statistics.cs
	Raven.Tests/Issues/RavenDB_1007.cs
	Raven.Tests/Issues/RavenDB_1333.cs
	Raven.Tests/Issues/RavenDB_1594.cs
	Raven.Tests/Issues/RavenDB_551.cs
	Raven.Tests/MailingList/DifferentKeysWithTheSameFirst127CharactersAreDifferent.cs
	Raven.Tests/MailingList/FailingBulkInsertTest.cs
	Raven.Tests/Queries/ParameterizedDynamicQuery.cs
	Raven.Tests/RavenTest.cs
	Raven.Tests/Spatial/SpatialIndexTest.cs
	Raven.Tests/Storage/GeneralStorage.cs
	Raven.Tests/Triggers/IndexTriggers.cs
	Raven.Tests/Triggers/ReadTriggers.cs
	Raven.Tests/Views/MapReduce_IndependentSteps.cs
	Raven.Tests/packages.config
	Raven.Tryouts/Program.cs
	Raven.Tryouts/app.config
	Raven.Tryouts/packages.config
	Raven.Voron/Voron.Tryout/Properties/AssemblyInfo.cs
	Raven.Web/Web.config
	SharedLibs/Lucene.Net.Contrib.Spatial.XML
	SharedLibs/Sources/managedesent-61618/PixieSamples/GettingStarted/Properties/AssemblyInfo.cs
	Voron.Benchmark/Properties/AssemblyInfo.cs
	Voron.Tests/Properties/AssemblyInfo.cs
	Voron.Tryout/Properties/AssemblyInfo.cs
merge conflict fixes
after merge nuget adjustments
Merge commit 'db5733a0d29876d5a640d46f392cf9674f4029eb' into RavenDB-1325

Conflicts:
	Raven.Voron/Performance.Comparison/FreeDB.Playground/FreeDbQueries.cs
	Raven.Voron/Performance.Comparison/FreeDB.Playground/Program.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison.sln
	Raven.Voron/Performance.Comparison/Performance.Comparison/Esent/EsentTest.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/FoundationDB/FdbTest.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/IStoragePerformanceTest.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/LMDB/LmdbTest.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/PerformanceRecord.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/Program.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/SQLCE/SqlCeTest.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/SQLServer/SqlServerTest.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/SQLite/SqlLiteTest.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/StoragePerformanceTestBase.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/TestData.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/Voron/VoronTest.cs
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/App.config
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/DateTimeSeries.cs
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/Program.cs
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/Properties/AssemblyInfo.cs
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/TimeSeries.Playground.csproj
	Raven.Voron/Performance.Comparison/TimeSeries.Playground/packages.config
	Raven.Voron/Voron.Tests/Bugs/Deletes.cs
	Raven.Voron/Voron.Tests/Bugs/EmptyTree.cs
	Raven.Voron/Voron.Tests/Bugs/FlushingToDataFile.cs
	Raven.Voron/Voron.Tests/Bugs/InvalidReleasesOfScratchPages.cs
	Raven.Voron/Voron.Tests/Bugs/LargeValues.cs
	Raven.Voron/Voron.Tests/Bugs/MemoryAccess.cs
	Raven.Voron/Voron.Tests/Bugs/MultiAdds.cs
	Raven.Voron/Voron.Tests/Bugs/PageSplitter.cs
	Raven.Voron/Voron.Tests/Bugs/PageTableIssue.cs
	Raven.Voron/Voron.Tests/Bugs/PagesFilteredOutByJournalApplicator.cs
	Raven.Voron/Voron.Tests/Bugs/Recovery.cs
	Raven.Voron/Voron.Tests/Bugs/RecoveryMultipleJournals.cs
	Raven.Voron/Voron.Tests/Bugs/Snapshots.cs
	Raven.Voron/Voron.Tests/Bugs/TreeRebalancer.cs
	Raven.Voron/Voron.Tests/MultiValueTree.cs
	Raven.Voron/Voron.Tests/Storage/Batches.cs
	Raven.Voron/Voron.Tests/Storage/Restarts.cs
	Raven.Voron/Voron.Tests/Storage/SplittingVeryBig.cs
	Raven.Voron/Voron.Tests/Storage/VeryBig.cs
	Raven.Voron/Voron.Tests/StorageTest.cs
	Raven.Voron/Voron.Tests/Trees/MultipleTrees.cs
	Raven.Voron/Voron.Tests/Voron.Tests.csproj
	Raven.Voron/Voron.Tryout/Program.cs
	Raven.Voron/Voron/Debugging/DebugStuff.cs
	Raven.Voron/Voron/Impl/FreeSpace/FreeSpaceHandling.cs
	Raven.Voron/Voron/Impl/Journal/IJournalWriter.cs
	Raven.Voron/Voron/Impl/Journal/JournalFile.cs
	Raven.Voron/Voron/Impl/Journal/JournalReader.cs
	Raven.Voron/Voron/Impl/Journal/PureMemoryJournalWriter.cs
	Raven.Voron/Voron/Impl/Journal/Win32JournalWriter.cs
	Raven.Voron/Voron/Impl/Journal/WriteAheadJournal.cs
	Raven.Voron/Voron/Impl/Paging/AbstractPager.cs
	Raven.Voron/Voron/Impl/Paging/FilePager.cs
	Raven.Voron/Voron/Impl/Paging/FragmentedPureMemoryPager.cs
	Raven.Voron/Voron/Impl/Paging/IVirtualPager.cs
	Raven.Voron/Voron/Impl/Paging/MemoryMappedPager.cs
	Raven.Voron/Voron/Impl/Paging/Win32PureMemoryPager.cs
	Raven.Voron/Voron/Impl/ScratchBufferPool.cs
	Raven.Voron/Voron/Impl/SnapshotReader.cs
	Raven.Voron/Voron/Impl/StorageEnvironmentState.cs
	Raven.Voron/Voron/Impl/Transaction.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs
	Raven.Voron/Voron/Properties/AssemblyInfo.cs
	Raven.Voron/Voron/Slice.cs
	Raven.Voron/Voron/StorageEnvironment.cs
	Raven.Voron/Voron/Trees/Cursor.cs
	Raven.Voron/Voron/Trees/RecentlyFoundPages.cs
	Raven.Voron/Voron/Util/ConcurrentSet.cs
	Raven.Voron/Voron/Util/NativeFileMethods.cs
	Raven.Voron/Voron/Util/PageTable.cs
	Raven.Voron/Voron/Util/TreeExtensions.cs
	Raven.Voron/Voron/ValueReader.cs
	Raven.Voron/Voron/Voron.csproj
	Raven.Voron/readme.txt
RavenDB-1651 Voron CPU usage when idle
Moving to custom version of xunit.
Can now track what test leaks the connections
fixed DebugJournal
added the option to dump only stream length for faster processing
fixed issue with releasing entries from scratch - there is a possibility that transaction contains more than one page from scratch that points to the same page number (ModifyPage), which in the end causes duplicates in the _unusedPages
added a test for RavenDB-1707
RavenDB-1700 Fixing the order of freeing scratch pages: we have to free pages of unused journals first before the other journals because otherwise a read transaction could read an outdated page from the older and not relevant journal
Merge branch 'RavenDB-1700' of https://github.com/arekais/ravendb into New3
Failing tests which shows that free space handling does not work for sections higher than 0