Merge origin/master

Conflicts:
	administracion/administracion.js/Ventas.js
Merge origin/master

Conflicts:
	administracion/administracion.js/Ventas.js