*include ajax for emailTemplate forms
Merge remote-tracking branch 'origin/master'