v2
Merge branch 'master' of https://github.com/Mingok/eclectica

Conflicts:
	form07Ventas.php
	js/tablaItemVenta/controlItemVenta.js
	views/venta/ventaDetalle.php