*push the dev version of emailTemplate module
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/frontend/modules/dashboard/actions/actions.class.php