OSI_FS0006 - Item 40 Commit inicial da tela de Atributo
Merge branch 'OSI_FS0006' of https://github.com/andrethomazini/siga into OSI_FS0006
OSI_FS0006 - Item 40 Tela de Atributo
Merge branch 'OSI_FS0006' of https://github.com/andrethomazini/siga into OSI_FS0006

Conflicts:
	sigasr/app/models/SrConfiguracao.java
	sigasr/app/models/vo/SrConfiguracaoVO.java
OSI_FS0006 - Item 40 Tela de Atributo
Merge branch 'OSI_FS0006' of https://github.com/andrethomazini/siga into OSI_FS0006