a

Signed-off-by: fabioribeiro <fabio.ribeiro@synchro.com.br>
Merge branch 'master' of https://github.com/fabioribeiro/Simor

Conflicts:
	WebContent/relatorioStatus.jsp

Signed-off-by: fabioribeiro <fabio.ribeiro@synchro.com.br>