Fixed merge issues with RavenFS branch.
make things compile and run (fixed some merge problems)
Merge branch 'master' of https://github.com/maximburyak/ravendb
Fixing merge