update actipro
Merge branch '2.5' of github.com:DanielDar/ravendb into 2.5
Will interleave and trim history on conflict resolution
Merge branch '2.5' of github.com:fitzchak/ravendb into 2.5