moviendo botón al medio
Merge branch 'master' into Uchija

Conflicts:
	views/sindicato/ver_sindicato.erb
de nuevo
Merge branch 'master' into Uchija
Merge branch 'Uchija'