Merge pull request #1 from kristallizer/develop

Develop
adding edit sample template
Merge pull request #2 from adt123/develop

Develop