Merge origin/master

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

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

Conflicts:
	src/main/webapp/paginas/producto/crear.xhtml