mail
Merge branch 'master' of https://github.com/EasyLovine/ZencTbi

Conflicts:
	ezl_admin/includes/modules/update_product.php