Cambios 123
Cambios en Home
Merge branch 'master' of ssh://git@github.com/jpretel/sicf.web.git

Conflicts:
	sicf.web/web/home.xhtml