2.2
2.2
Merge branch 'master' of https://github.com/NBNG/siroc

Conflicts:
	SIROC/src/br/com/siroc/Jasper/pedidoMeiaPagina_TotalPesoValor.jrxml