Merge origin/master

Conflicts:
	src/main/webapp/paginas/admin/bussinesentitytype/list.xhtml
	src/main/webapp/paginas/admin/planMantenimiento/crear.xhtml
Merge origin/master

Conflicts:
	src/main/webapp/paginas/admin/bussinesentitytype/list.xhtml
	src/main/webapp/paginas/admin/planMantenimiento/crear.xhtml
Merge origin/master