Added editor option to template entity.
Merge branch 'origin/develop'