update
Merge branch 'master' of https://github.com/javiduel/productosMC3.git

Conflicts:
	ProductosMVC2/src/main/webapp/WEB-INF/views/modificar.jsp