Resolvido erros no ArquivoConfiguracao
Merge branch 'develop'

Conflicts:
	src/main/java/br/com/sheeva/service/impl/InstanciaServiceImpl.java
getArquivoConfiguracao