ok
Merge branch 'master' of
https://github.com/metalkarlos/campofelizweb.git

Conflicts:
	campofelizweb/WebContent/WEB-INF/includes/menu.xhtml