cambios menores
Merge branch 'master' of github.com:xignus/distribuidora

Conflicts:
	databases/storage.sqlite