Merge pull request #4 from ifunsoftware/master

merge to upstream
Merge pull request #5 from ifunsoftware/master

Merge to upstream
[Add] history tracking in fs operations
[Change][WIP] continue working on versioned directory structure
[Change] directory entries history tracking
[Change] method put removed from storages, we can use update for the same purpose.
[Change] new logic to resolve update conflicts in versioned resources
[Remove] replicated bdb storage
[Add] conflicts in non-versioned resources are handled by conflictResolver
[Add] DirectoryConflictResolver
[Change] small refactoring in FSManagerImpl
[Change] directory conflict
[Add] directory  conflict resolver test case
[Change] removed tika-api from dependencies
[Fixed] concurrent directory update
[Fixed] resource must be cloned before returned from cache
[Fixed] RMW lock on resource data in bdb storage
Merge pull request #6 from ifunsoftware/fsdir_history

Fsdir history
Merge pull request #1 from aphreet/master

Integrate directory modifications