Avanzado en agenda.
Pequeno bug de vista de salas
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/models/cleanup_request.rb