CRAFTERCMS-926: fixed the issue with edit template
Merge pull request #307 from hlim/master

CRAFTERCMS-926: fixed the issue with edit template