conflict resolution support with add-only Set test
Merge pull request #2 from istvan-soos/master

conflict resolution support
reading ETag and Last Modified response headers
Merge pull request #3 from istvan-soos/master

reading ETag and Last Modified response headers