FIX: Aplica cambios en la base de datos
Merge branch 'master' of https://github.com/juanfernandez/carrocompras

Conflicts:
	build/web/WEB-INF/classes/Controlador/Controlador.class
	build/web/WEB-INF/classes/Modelo/Conexion.class
	nbproject/private/private.xml