Merge origin/master

Conflicts:
	src/com/sistemas/REPORTES/rCliente.jasper
	src/com/sistemas/REPORTES/rInventario.docx
	src/com/sistemas/REPORTES/rPrestamo.jasper