cambios
Merge origin/master

Conflicts:
	administracion/administracion.js/entradas.js