Merge origin/master

Conflicts:
	src/main/webapp/paginas/producto/crear.xhtml
	src/main/webapp/paginas/producto/lista.xhtml
Merge origin/master