Modificando a estrutura do repo
Merge branch 'master' of github.com:zyc/portal-services

Conflicts:
	impl/server/src/main/resources/demoiselle.properties