Modificado

Modificado
Merge branch 'master' of https://github.com/AngelTalledo/ecart-customer

Conflicts:
	index.php
	login.php