arreglo de botones
Merge branch 'master' into Uchija
Merge branch 'Uchija'

Conflicts:
	views/sindicato/ver_sindicato.erb