- Fixed files grid that got broken with a previous commit
- Fixed conflict notifications which were not working at all
Merge branch 'master' of https://github.com/Corvalius/ravendb