93-creating-new-edit-template
Fixed conflicts
Merge pull request #40 from gotar/93-creating-new-edit-template

93-creating-new-edit-template