fix backup now work correctly
Merge remote-tracking branch 'origin/master'

Conflicts:
	apps/frontend/modules/emailTemplate/actions/actions.class.php
Merge remote-tracking branch 'origin/master'