ajustes
Merge remote-tracking branch 'origin/master'

Conflicts:
	_inc/_smarty/templates/admin/columna.centro.registro-docente.tpl
Merge remote-tracking branch 'origin/master'
limpiando proyecto detalle