Hotfix for content save
Merge branch 'staging' of github.com:asikart/ezset into staging