merge com o branch develop #16
Merge branch 'migracao-jboss6' of https://github.com/projeto-siga/siga into migracao-jboss6