Version update
Added file storage for each item type.
Version bump
Merge branch 'release/3.3.0' into develop