*include ajax ALALALLA
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/frontend/modules/emailTemplate/templates/_form.php