Excluindo conflitos

Conflitos ocorriam no sigatp..
Merge branch 'migracao-jboss6' of https://github.com/projeto-siga/siga into migracao-jboss6