added form template preview
Merge branch 'dev' into template-preview
bad event