Merge origin/master

Conflicts:
	src/com/sistemas/REPORTES/rInventario.jasper
Merge origin/master

Conflicts:
	src/com/sistemas/REPORTES/rInventario.jasper
Merge origin/master