Improvements to claimant snapshot handling, claim attachments, local
claims list
Merged master fixed conflicts.
Separated media storage for claim and claimant