Refactoring savecontent
Merge pull request #1218 from rarila/refactoring-content-related

Refactoring savecontent