fix drag and drop in formbuilder
Merge branch 'develop'