#29762 Custom template integration in widget creation form DB part and bug fixes
bug fixes
#29763 smarty and tpl part
Merge branch 'Jagadees-zyxware-master'