Refactoring add/edit Item with new persistent function
Merge remote-tracking branch 'origin/master'