Commit Inicial
Merge origin/master into augusto

Conflicts:
	src/java/jsf/prueba.java
	src/java/lazyModels/LazyClientesModel.java
	web/index.xhtml
Merge pull request #1 from Pweb-fpuna/augusto

Augusto