lala
Merge branch 'master' of https://github.com/Allin-GDD/FrbaCommerce

Conflicts:
	FrbaCommerce/Roles/Rol_Cliente.cs
Merge branch 'master' of https://github.com/Allin-GDD/FrbaCommerce