added ScriptTemplates
Merge branch 'develop'