templates added to devstage branch
Merge branch 'master' into devstage
Merge branch 'devstage'