Subo:
- infraestructura modificada para incluir una nueva tabla de estado, que
  contiene la distribución de las máquinas virtuales.
- conector modificado para explotar la nueva funcionalidad de la
  infraestructura.
- base de datos de estado modificada para albergar esta nueva información.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/clusterServer/connector/clusterServerConnector.py
	modified:   src/CygnusCloud/clusterServer/main.py
	modified:   src/CygnusCloud/clusterServer/networking/packets.py
	modified:   src/CygnusCloud/clusterServer/reactor/clusterServerReactor.py
	modified:   src/CygnusCloud/database/SystemStatusDB.sql
	modified:   src/CygnusCloud/database/clusterServer/clusterServerDB.py
	modified:   src/CygnusCloud/database/systemStatusDB/systemStatusDBReader.py
	modified:   src/CygnusCloud/database/systemStatusDB/systemStatusDBWriter.py
	modified:   src/CygnusCloud/database/tests/SystemStatusDBTest.sql
	modified:   src/CygnusCloud/database/tests/systemStatusDBTests.py
	modified:   src/CygnusCloud/testing/clusterServerTester.py
Subo:
- paquetes de transferencia de datos de conexión implementados en el
  servidor de máquinas virtuales (sin probar).

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/clusterServer/reactor/clusterServerReactor.py
	modified:   src/CygnusCloud/database/tests/vmServerDBTests.py
	modified:   src/CygnusCloud/database/utils/connector.py
	modified:   src/CygnusCloud/database/vmServer/runtimeData.py
	modified:   src/CygnusCloud/network/packets/packet.py
	modified:   src/CygnusCloud/testing/virtualMachineServerTester.py
	modified:   src/CygnusCloud/virtualMachineServer/packets.py
	modified:   src/CygnusCloud/virtualMachineServer/vmClient.py
Subo la web con los formularios correspondientes a la gestión de usuarios y asignaturas por parte del administrador completamente funcionales.

	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/controllers/administrator.py.bak
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_Images.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_ClassGroup.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_Images.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_Subjects.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_UserGroup.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_VMByGroup.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_auth_cas.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_auth_event.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_auth_group.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_auth_membership.table
	new file:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_auth_permission.table
Añado el formulario para la página de arranque de máquinas de usuario.Corregido un par de bug, traducidas algunas palabras de las nuevas páginas a inglés y viceversa
	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/controllers/administrator.py.bak
	modified:   web/CygnusCloud/controllers/student.py
	modified:   web/CygnusCloud/controllers/student.py.bak
	modified:   web/CygnusCloud/databases/63486635449b80ba7371dcc81f87d2dd_UserGroup.table
	modified:   web/CygnusCloud/databases/sql.log
	modified:   web/CygnusCloud/languages/default.py
	modified:   web/CygnusCloud/languages/es.py
	modified:   web/CygnusCloud/models/db.py
	modified:   web/CygnusCloud/models/db.py.bak
	modified:   web/CygnusCloud/progress.log
	modified:   web/CygnusCloud/views/student/runVM.html
	modified:   web/CygnusCloud/views/student/runVM.html.bak
Subo lo que he hecho hoy: "Terminada" página de arranque de máquinas para estucdiantes con gestión de la descripción actualizable y generación de hipervinculo
 que redirecciona a una nueva pestaña con el cliente VNC (de momento sin meter). "Terminada" página de arranque de máquinas virtuales para el administrador
 con el formulario de busqueda y la tabla de selección así como las funcionalidades descritas antes.

	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/controllers/administrator.py.bak
	modified:   web/CygnusCloud/controllers/student.py
	modified:   web/CygnusCloud/controllers/student.py.bak
	new file:   web/CygnusCloud/controllers/vncClient.py
	new file:   web/CygnusCloud/controllers/vncClient.py.bak
	modified:   web/CygnusCloud/languages/es.py
	modified:   web/CygnusCloud/progress.log
	new file:   web/CygnusCloud/sessions/127.0.0.1-47ea685a-ae5d-4ce8-ae22-961dcec04874
	modified:   web/CygnusCloud/sessions/127.0.0.1-94b597fa-52b2-4481-ad0f-59b1fd37bc50
	modified:   web/CygnusCloud/views/administrator/runVM.html
	modified:   web/CygnusCloud/views/administrator/runVM.html.bak
	new file:   web/CygnusCloud/views/vncClient/VNCPage.html
	new file:   web/CygnusCloud/views/vncClient/VNCPage.html.bak
Subo:
- información de máquinas virtuales activas recopilada desde la infraestructura.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/clusterServer/networking/packets.py
	modified:   src/CygnusCloud/clusterServer/reactor/clusterServerReactor.py
	modified:   src/CygnusCloud/database/ClusterServerDB.sql
	modified:   src/CygnusCloud/database/SystemStatusDB.sql
	modified:   src/CygnusCloud/database/VMServerDB.sql
	modified:   src/CygnusCloud/database/clusterServer/clusterServerDB.py
	modified:   src/CygnusCloud/database/systemStatusDB/systemStatusDBReader.py
	modified:   src/CygnusCloud/database/tests/SystemStatusDBTest.sql
	modified:   src/CygnusCloud/database/tests/VMServerDBTest.sql
	modified:   src/CygnusCloud/database/tests/clusterServerDBTests.py
	modified:   src/CygnusCloud/database/vmServer/runtimeData.py
	modified:   src/CygnusCloud/network/packets/packet.py
	modified:   src/CygnusCloud/testing/clusterServerTester.py
	modified:   src/CygnusCloud/testing/virtualMachineServerTester.py
	modified:   src/CygnusCloud/virtualMachineServer/packets.py
	modified:   src/CygnusCloud/virtualMachineServer/vmClient.py
Subo:
- infraestructura preparada para recolectar los datos de las máquinas virtuales activas y la distribución de las máquinas virtuales.
- formatos de paquete modificados para utilizar ints en lugar de longs (y así ser coherentes con lo que hay en la base de datos).
- pruebas unitarias de los módulos de la base de datos revisadas para incluir los nuevos métodos.
- testers modificados para manipular los nuevos paquetes.
- servidor de máquinas virtuales dummy modificado para incorporar la nueva funcionalidad.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/clusterServer/connector/clusterServerConnector.py
	modified:   src/CygnusCloud/clusterServer/networking/packets.py
	modified:   src/CygnusCloud/clusterServer/reactor/clusterServerReactor.py
	modified:   src/CygnusCloud/database/systemStatusDB/systemStatusDBReader.py
	modified:   src/CygnusCloud/database/systemStatusDB/systemStatusDBWriter.py
	modified:   src/CygnusCloud/database/tests/systemStatusDBTests.py
	modified:   src/CygnusCloud/database/tests/vmServerDBTests.py
	modified:   src/CygnusCloud/database/vmServer/runtimeData.py
	modified:   src/CygnusCloud/testing/clusterServerTester.py
	modified:   src/CygnusCloud/testing/dummyVMServer.py
	modified:   src/CygnusCloud/virtualMachineServer/packets.py
	modified:   src/CygnusCloud/virtualMachineServer/vmClient.py
Subo:
- red ligeramente modificada para no crear el hilo reactor cuando
  se le pide.
- conector de la web modificado para tomar como argumento la ruta del
  fichero SQL al conectarse a la base de datos de estado.

 On branch infrastructure-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/clusterServer/connector/clusterServerConnector.py
	modified:   src/CygnusCloud/clusterServer/reactor/clusterServerReactor.py
	modified:   src/CygnusCloud/database/VMServerDB.sql
	modified:   src/CygnusCloud/network/manager/networkManager.py
	modified:   src/CygnusCloud/virtualMachineServer/vmClient.py
Cambio de nombre al paquete utils para evitar problemas con web2py. Ahora se llamará ccutils.

 On branch infrastructure-upstream
 Changes to be committed:

	renamed:    utils/__init__.py -> ccutils/__init__.py
	renamed:    utils/commands.py -> ccutils/commands.py
	renamed:    utils/enums.py -> ccutils/enums.py
	renamed:    utils/multithreadingCounter.py -> ccutils/multithreadingCounter.py
	renamed:    utils/multithreadingDictionary.py -> ccutils/multithreadingDictionary.py
	renamed:    utils/multithreadingList.py -> ccutils/multithreadingList.py
	renamed:    utils/multithreadingPriorityQueue.py -> ccutils/multithreadingPriorityQueue.py
	renamed:    utils/rootPasswordHandler.py -> ccutils/rootPasswordHandler.py
	renamed:    utils/threads.py -> ccutils/threads.py
	modified:   clusterServer/connector/databaseUpdateThread.py
	modified:   clusterServer/networking/packets.py
	modified:   database/clusterServer/clusterServerDB.py
	modified:   database/webServer/userAccess.py
	modified:   database/webServer/userManagement.py
	modified:   network/manager/networkManager.py
	modified:   network/packets/packet.py
	modified:   network/threads/connectionMonitoring.py
	modified:   network/threads/dataProcessing.py
	modified:   network/twistedInteraction/connection.py
	modified:   network/twistedInteraction/protocols.py
	modified:   virtualMachineServer/packets.py
	modified:   virtualMachineServer/virtualNetwork/virtualNetworkManager.py
	modified:   virtualMachineServer/vmClient.py
Merge branch 'infrastructure-upstream' into web_development
Merge branch 'web_development'