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

Conflicts:
	Migracion full 2.0.sql