Merge commit '4d86cebf6bbd3ab2c733d195425a93a097c35341' into New3

Conflicts:
	Raven.Voron/.gitignore
	Raven.Voron/Performance.Comparison/Performance.Comparison/Program.cs
	Raven.Voron/Voron.Tests/Storage/Batches.cs
	Raven.Voron/Voron.Tests/Storage/Concurrency.cs
	Raven.Voron/Voron.Tests/Storage/Pagers.cs
	Raven.Voron/Voron.Tests/StorageTest.cs
	Raven.Voron/Voron.Tryout/Program.cs
	Raven.Voron/Voron/Impl/Backup/IncrementalBackup.cs
	Raven.Voron/Voron/Impl/Journal/JournalFile.cs
	Raven.Voron/Voron/Impl/Journal/JournalReader.cs
	Raven.Voron/Voron/Impl/Journal/WriteAheadJournal.cs
	Raven.Voron/Voron/Impl/PagerState.cs
	Raven.Voron/Voron/Impl/Paging/AbstractPager.cs
	Raven.Voron/Voron/Impl/Paging/FilePager.cs
	Raven.Voron/Voron/Impl/Paging/MemoryMappedPager.cs
	Raven.Voron/Voron/Impl/Paging/PureMemoryPager.cs
	Raven.Voron/Voron/Impl/SliceEqualityComparer.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/Impl/WriteBatch.cs
	Raven.Voron/Voron/StorageEnvironment.cs
	Raven.Voron/Voron/StorageEnvironmentOptions.cs
	Raven.Voron/Voron/Voron.csproj
Merge branch 'voron' of https://github.com/ayende/raven.voron into voron
Merge branch 'New3' of github.com:ayende/ravendb into New3

Conflicts:
	Raven.Client.Lightweight/Connection/AdminServerClient.cs
	Raven.Client.Lightweight/Connection/Async/AsyncServerClient.cs
	Raven.Client.Lightweight/Connection/Async/IAsyncDatabaseCommands.cs
	Raven.Client.Lightweight/Connection/Implementation/HttpJsonRequestFactory.cs
	Raven.Client.Lightweight/Connection/RavenUrlExtensions.cs
	Raven.Client.Lightweight/Connection/ServerClient.cs
	Raven.Client.Lightweight/Document/DocumentStore.cs
	Raven.Client.Silverlight/Connection/HttpJsonRequest.cs
	Raven.Database/Storage/Voron/Impl/TableStorage.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison.v11.suo
	Raven.Voron/Performance.Comparison/Performance.Comparison/FoundationDB/FdbTest.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/ParallelTestData.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/Program.cs
	Raven.Voron/Voron.Tests/StorageTest.cs
	Raven.Voron/Voron.Tryout/Program.cs
	Raven.Voron/Voron/Impl/Backup/IncrementalBackup.cs
	Raven.Voron/Voron/Impl/Journal/JournalFile.cs
	Raven.Voron/Voron/Impl/Journal/JournalReader.cs
	Raven.Voron/Voron/Impl/Journal/JournalSnapshot.cs
	Raven.Voron/Voron/Impl/Journal/Win32JournalWriter.cs
	Raven.Voron/Voron/Impl/Journal/WriteAheadJournal.cs
	Raven.Voron/Voron/Impl/PagerState.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/MemoryMappedPager.cs
	Raven.Voron/Voron/Impl/Paging/PureMemoryPager.cs
	Raven.Voron/Voron/Impl/StorageEnvironmentState.cs
	Raven.Voron/Voron/Impl/Transaction.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs
	Raven.Voron/Voron/StorageEnvironment.cs
	Raven.Voron/Voron/StorageEnvironmentOptions.cs
Merge branch 'New3' of github.com:ayende/ravendb into New3

Conflicts:
	Raven.Client.Lightweight/Connection/AdminServerClient.cs
	Raven.Client.Lightweight/Connection/Async/AsyncServerClient.cs
	Raven.Client.Lightweight/Connection/Async/IAsyncDatabaseCommands.cs
	Raven.Client.Lightweight/Connection/Implementation/HttpJsonRequestFactory.cs
	Raven.Client.Lightweight/Connection/RavenUrlExtensions.cs
	Raven.Client.Lightweight/Connection/ServerClient.cs
	Raven.Client.Lightweight/Document/DocumentStore.cs
	Raven.Client.Silverlight/Connection/HttpJsonRequest.cs
	Raven.Database/Storage/Voron/Impl/TableStorage.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison.v11.suo
	Raven.Voron/Performance.Comparison/Performance.Comparison/FoundationDB/FdbTest.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/ParallelTestData.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/Program.cs
	Raven.Voron/Voron.Tests/StorageTest.cs
	Raven.Voron/Voron.Tryout/Program.cs
	Raven.Voron/Voron/Impl/Backup/IncrementalBackup.cs
	Raven.Voron/Voron/Impl/Journal/JournalFile.cs
	Raven.Voron/Voron/Impl/Journal/JournalReader.cs
	Raven.Voron/Voron/Impl/Journal/JournalSnapshot.cs
	Raven.Voron/Voron/Impl/Journal/Win32JournalWriter.cs
	Raven.Voron/Voron/Impl/Journal/WriteAheadJournal.cs
	Raven.Voron/Voron/Impl/PagerState.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/MemoryMappedPager.cs
	Raven.Voron/Voron/Impl/Paging/PureMemoryPager.cs
	Raven.Voron/Voron/Impl/StorageEnvironmentState.cs
	Raven.Voron/Voron/Impl/Transaction.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs
	Raven.Voron/Voron/StorageEnvironment.cs
	Raven.Voron/Voron/StorageEnvironmentOptions.cs
Merge branch 'voron' of github.com:ayende/raven.voron into RavenDB-1500
Merge branch 'RavenDB-1500' of github.com:ayende/raven.voron into voron
Merge pull request #491 from ppekrol/test-fixes

fixed GetDocumentsWithIdStartingWith and GroupByAndDocumentId tests
Merge branch 'voron' of https://github.com/ayende/raven.voron into voron
Merge branch 'voron' of https://github.com/ayende/raven.voron into voron

Conflicts:
	Voron/StorageEnvironment.cs
Merge branch 'voron' of github.com:ayende/raven.voron into voron
Merge branch 'voron' of https://github.com/ayende/raven.voron into voron

Conflicts:
	Voron/Trees/TreeRebalancer.cs
Merge branch 'New3' of https://github.com/DanielDar/ravendb into New3

Conflicts:
	Raven.Voron/Voron/Impl/Journal/JournalSnapshot.cs
	Raven.Voron/Voron/Impl/Journal/Win32JournalWriter.cs
	Raven.Voron/Voron/Impl/Paging/FragmentedPureMemoryPager.cs
Merge branch 'New3' of https://github.com/DanielDar/ravendb into New3

Conflicts:
	Raven.Voron/Voron/Impl/Journal/JournalSnapshot.cs
	Raven.Voron/Voron/Impl/Journal/Win32JournalWriter.cs
	Raven.Voron/Voron/Impl/Paging/FragmentedPureMemoryPager.cs
Merge branch 'voron' of github.com:ayende/raven.voron into RavenDB-1503
Merge commit '11c2592a765090c61f3b0761047676f17ec60ea6' into New3

Conflicts:
	Raven.Voron/Performance.Comparison/Other/LMDB/lmdb_perf_test.cpp
	Raven.Voron/Performance.Comparison/Performance.Comparison/Constants.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/ParallelTestData.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/Performance.Comparison.csproj
	Raven.Voron/Performance.Comparison/Performance.Comparison/Program.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/StoragePerformanceTestBase.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/Voron/VoronTest.cs
	Raven.Voron/Voron.Tests/Bugs/PageSplitter.cs
	Raven.Voron/Voron.Tests/Storage/Batches.cs
	Raven.Voron/Voron.Tests/Storage/BigValue.cs
	Raven.Voron/Voron.Tests/Storage/Concurrency.cs
	Raven.Voron/Voron.Tests/StorageTest.cs
	Raven.Voron/Voron.Tests/Voron.Tests.csproj
	Raven.Voron/Voron.Tryout/Program.cs
	Raven.Voron/Voron.Tryout/Voron.Tryout.csproj
	Raven.Voron/Voron/Debugging/DebugStuff.cs
	Raven.Voron/Voron/Impl/Backup/FullBackup.cs
	Raven.Voron/Voron/Impl/Backup/IncrementalBackup.cs
	Raven.Voron/Voron/Impl/Journal/JournalFile.cs
	Raven.Voron/Voron/Impl/Journal/JournalReader.cs
	Raven.Voron/Voron/Impl/Journal/JournalSnapshot.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/FragmentedPureMemoryPager.cs
	Raven.Voron/Voron/Impl/Paging/IVirtualPager.cs
	Raven.Voron/Voron/Impl/Paging/MemoryMappedPager.cs
	Raven.Voron/Voron/Impl/Paging/PureMemoryPager.cs
	Raven.Voron/Voron/Impl/SliceEqualityComparer.cs
	Raven.Voron/Voron/Impl/StorageEnvironmentState.cs
	Raven.Voron/Voron/Impl/Transaction.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs
	Raven.Voron/Voron/Impl/WriteBatch.cs
	Raven.Voron/Voron/StorageEnvironment.cs
	Raven.Voron/Voron/StorageEnvironmentOptions.cs
	Raven.Voron/Voron/Trees/Cursor.cs
	Raven.Voron/Voron/Trees/Page.cs
	Raven.Voron/Voron/Trees/PageFlags.cs
	Raven.Voron/Voron/Trees/PageSplitter.cs
	Raven.Voron/Voron/Trees/Tree.cs
	Raven.Voron/Voron/Trees/TreeIterator.cs
	Raven.Voron/Voron/Trees/TreeRebalancer.cs
	Raven.Voron/Voron/Util/NativeFileMethods.cs
	Raven.Voron/Voron/Voron.csproj
Merge commit '11c2592a765090c61f3b0761047676f17ec60ea6' into New3

Conflicts:
	Raven.Voron/Performance.Comparison/Other/LMDB/lmdb_perf_test.cpp
	Raven.Voron/Performance.Comparison/Performance.Comparison/Constants.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/ParallelTestData.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/Performance.Comparison.csproj
	Raven.Voron/Performance.Comparison/Performance.Comparison/Program.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/StoragePerformanceTestBase.cs
	Raven.Voron/Performance.Comparison/Performance.Comparison/Voron/VoronTest.cs
	Raven.Voron/Voron.Tests/Bugs/PageSplitter.cs
	Raven.Voron/Voron.Tests/Storage/Batches.cs
	Raven.Voron/Voron.Tests/Storage/BigValue.cs
	Raven.Voron/Voron.Tests/Storage/Concurrency.cs
	Raven.Voron/Voron.Tests/StorageTest.cs
	Raven.Voron/Voron.Tests/Voron.Tests.csproj
	Raven.Voron/Voron.Tryout/Program.cs
	Raven.Voron/Voron.Tryout/Voron.Tryout.csproj
	Raven.Voron/Voron/Debugging/DebugStuff.cs
	Raven.Voron/Voron/Impl/Backup/FullBackup.cs
	Raven.Voron/Voron/Impl/Backup/IncrementalBackup.cs
	Raven.Voron/Voron/Impl/Journal/JournalFile.cs
	Raven.Voron/Voron/Impl/Journal/JournalReader.cs
	Raven.Voron/Voron/Impl/Journal/JournalSnapshot.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/FragmentedPureMemoryPager.cs
	Raven.Voron/Voron/Impl/Paging/IVirtualPager.cs
	Raven.Voron/Voron/Impl/Paging/MemoryMappedPager.cs
	Raven.Voron/Voron/Impl/Paging/PureMemoryPager.cs
	Raven.Voron/Voron/Impl/SliceEqualityComparer.cs
	Raven.Voron/Voron/Impl/StorageEnvironmentState.cs
	Raven.Voron/Voron/Impl/Transaction.cs
	Raven.Voron/Voron/Impl/TransactionMergingWriter.cs
	Raven.Voron/Voron/Impl/WriteBatch.cs
	Raven.Voron/Voron/StorageEnvironment.cs
	Raven.Voron/Voron/StorageEnvironmentOptions.cs
	Raven.Voron/Voron/Trees/Cursor.cs
	Raven.Voron/Voron/Trees/Page.cs
	Raven.Voron/Voron/Trees/PageFlags.cs
	Raven.Voron/Voron/Trees/PageSplitter.cs
	Raven.Voron/Voron/Trees/Tree.cs
	Raven.Voron/Voron/Trees/TreeIterator.cs
	Raven.Voron/Voron/Trees/TreeRebalancer.cs
	Raven.Voron/Voron/Util/NativeFileMethods.cs
	Raven.Voron/Voron/Voron.csproj
Merge branch 'New3' of github.com:DanielDar/ravendb into New3

Conflicts:
	Raven.Voron/Performance.Comparison/Performance.Comparison/app.manifest
	Raven.Voron/Voron.Tryout/app.manifest
	Raven.Voron/Voron/Impl/Journal/PureMemoryJournalWriter.cs
	Raven.Voron/Voron/Impl/ScratchBufferPool.cs
	Raven.Voron/Voron/Util/SafeList.cs
Merge branch 'New3' of github.com:DanielDar/ravendb into New3

Conflicts:
	Raven.Voron/Performance.Comparison/Performance.Comparison/app.manifest
	Raven.Voron/Voron.Tryout/app.manifest
	Raven.Voron/Voron/Impl/Journal/PureMemoryJournalWriter.cs
	Raven.Voron/Voron/Impl/ScratchBufferPool.cs
	Raven.Voron/Voron/Util/SafeList.cs
Merge branch 'RavenDB-1503' of https://github.com/ayende/raven.voron into voron

Conflicts:
	Voron/Voron.csproj
Merge branch 'voron' of https://github.com/ayende/raven.voron into voron