RavenDB-2957 Merge database & file systems views
Merge pull request #1645 from ml054/RavenDB-2957

RavenDB-2957 Merge database & file systems views