conflict resolves after git-subtree pull from Voron latest branch
Merge commit '0ee3ef6771e41d7c7dab8c328326880abf6caf9a' into 2.5-voron

Conflicts:
	Raven.Voron/.gitignore
	Raven.Voron/.nuget/NuGet.Config
	Raven.Voron/.nuget/NuGet.targets
	Raven.Voron/Voron.Benchmark/App.config
	Raven.Voron/Voron.Benchmark/Program.cs
	Raven.Voron/Voron.Benchmark/Properties/AssemblyInfo.cs
	Raven.Voron/Voron.Benchmark/Voron.Benchmark.csproj
	Raven.Voron/Voron.Tests/Backup/CanBackupData.cs
	Raven.Voron/Voron.Tests/Bugs/EmptyTree.cs
	Raven.Voron/Voron.Tests/Bugs/UpdateLastItem.cs
	Raven.Voron/Voron.Tests/Impl/ConsecutiveSequencesTests.cs
	Raven.Voron/Voron.Tests/MultiValueTree.cs
	Raven.Voron/Voron.Tests/Properties/AssemblyInfo.cs
	Raven.Voron/Voron.Tests/Storage/Batches.cs
	Raven.Voron/Voron.Tests/Storage/Concurrency.cs
	Raven.Voron/Voron.Tests/Storage/MultiTransactions.cs
	Raven.Voron/Voron.Tests/Storage/Restarts.cs
	Raven.Voron/Voron.Tests/Storage/Snapshots.cs
	Raven.Voron/Voron.Tests/Storage/VeryBig.cs
	Raven.Voron/Voron.Tests/StorageTest.cs
	Raven.Voron/Voron.Tests/Trees/Basic.cs
	Raven.Voron/Voron.Tests/Trees/CanIterateBackward.cs
	Raven.Voron/Voron.Tests/Trees/Deletes.cs
	Raven.Voron/Voron.Tests/Trees/FreeSpaceTest.cs
	Raven.Voron/Voron.Tests/Trees/ItemsCount.cs
	Raven.Voron/Voron.Tests/Trees/Iteration.cs
	Raven.Voron/Voron.Tests/Trees/MultipleTrees.cs
	Raven.Voron/Voron.Tests/Trees/Rebalance.cs
	Raven.Voron/Voron.Tests/Trees/Updates.cs
	Raven.Voron/Voron.Tests/Voron.Tests.csproj
	Raven.Voron/Voron.Tests/packages.config
	Raven.Voron/Voron.Tryout/Program.cs
	Raven.Voron/Voron.Tryout/Properties/AssemblyInfo.cs
	Raven.Voron/Voron.Tryout/Voron.Tryout.csproj
	Raven.Voron/Voron.Tryout/app.config
	Raven.Voron/Voron.sln
	Raven.Voron/Voron/Debugging/DebugStuff.cs
	Raven.Voron/Voron/Debugging/EnvironmentStats.cs
	Raven.Voron/Voron/Debugging/TreeDumper.cs
	Raven.Voron/Voron/Exceptions/ConcurrencyException.cs
	Raven.Voron/Voron/Impl/AbstractPager.cs
	Raven.Voron/Voron/Impl/ConsecutiveSequences.cs
	Raven.Voron/Voron/Impl/Constants.cs
	Raven.Voron/Voron/Impl/Extensions/ConcurrentQueueExtensions.cs
	Raven.Voron/Voron/Impl/FileHeaders/FileHeader.cs
	Raven.Voron/Voron/Impl/FileHeaders/TreeFlags.cs
	Raven.Voron/Voron/Impl/FileHeaders/TreeRootHeader.cs
	Raven.Voron/Voron/Impl/FlushMode.cs
	Raven.Voron/Voron/Impl/FreeSpaceRepository.cs
	Raven.Voron/Voron/Impl/IFreeSpaceRepository.cs
	Raven.Voron/Voron/Impl/IVirtualPager.cs
	Raven.Voron/Voron/Impl/MemoryMapPager.cs
	Raven.Voron/Voron/Impl/NativeMethods.cs
	Raven.Voron/Voron/Impl/PagerState.cs
	Raven.Voron/Voron/Impl/PureMemoryPager.cs
	Raven.Voron/Voron/Impl/SizeOf.cs
	Raven.Voron/Voron/Impl/SliceComparer.cs
	Raven.Voron/Voron/Impl/SnapshotReader.cs
	Raven.Voron/Voron/Impl/Transaction.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs
	Raven.Voron/Voron/Impl/WriteBatch.cs
	Raven.Voron/Voron/Properties/AssemblyInfo.cs
	Raven.Voron/Voron/ReadResult.cs
	Raven.Voron/Voron/Slice.cs
	Raven.Voron/Voron/SliceOptions.cs
	Raven.Voron/Voron/StorageEnvironment.cs
	Raven.Voron/Voron/TransactionFlags.cs
	Raven.Voron/Voron/Trees/Cursor.cs
	Raven.Voron/Voron/Trees/EmptyIterator.cs
	Raven.Voron/Voron/Trees/IIterator.cs
	Raven.Voron/Voron/Trees/NodeFlags.cs
	Raven.Voron/Voron/Trees/NodeHeader.cs
	Raven.Voron/Voron/Trees/Page.cs
	Raven.Voron/Voron/Trees/PageFlags.cs
	Raven.Voron/Voron/Trees/PageHeader.cs
	Raven.Voron/Voron/Trees/PageSplitter.cs
	Raven.Voron/Voron/Trees/SingleEntryIterator.cs
	Raven.Voron/Voron/Trees/Tree.cs
	Raven.Voron/Voron/Trees/TreeDataInTransaction.cs
	Raven.Voron/Voron/Trees/TreeIterator.cs
	Raven.Voron/Voron/Trees/TreeMutableState.cs
	Raven.Voron/Voron/Trees/TreeRebalancer.cs
	Raven.Voron/Voron/Util/UnmanagedBits.cs
	Raven.Voron/Voron/Voron.csproj
	Raven.Voron/readme.txt
changes to Voron after commit of git-subtree pull changes
minor fix after pull
minor fixes to make RavenDB compile after Voron's git-subtree pull
minor fixes
Merge branch '2.5-voron' of https://github.com/ppekrol/ravendb into 2.5-voron
resolved pull conflicts
Conflicts:
	.gitignore
	Raven.Database/Storage/Voron/Impl/TableStorage.cs
	Raven.Voron/Voron/Impl/SnapshotReader.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs