Configurando
Mudanças
Alteração
Merge branch 'master' of https://github.com/jocelio/base.git

Conflicts:
	Ivy/WebContent/index.xhtml