Merge branch 'New3' of github.com:ayende/ravendb into New3

Conflicts:
	Raven.Database/DocumentDatabase.cs
Merge branch 'New3' of github.com:fitzchak/ravendb into New3

Conflicts:
	Raven.Database/DocumentDatabase.cs