added support for template descriptions
Merge branch 'master' into working_editor