Añado lo que llevo sobre la web

	new file:   web/CygnusCloud/ABOUT
	new file:   web/CygnusCloud/LICENSE
	new file:   web/CygnusCloud/__init__.py
	new file:   web/CygnusCloud/cache/cache.lock
	new file:   web/CygnusCloud/cache/cache.shelve
	new file:   web/CygnusCloud/controllers/appadmin.py
	new file:   web/CygnusCloud/controllers/default.py.bak
	new file:   web/CygnusCloud/controllers/hijo.py.bak
	new file:   web/CygnusCloud/controllers/index.py.bak
	new file:   web/CygnusCloud/controllers/main.py
	new file:   web/CygnusCloud/controllers/main.py.bak
	new file:   web/CygnusCloud/controllers/plugin_translate.py
	new file:   web/CygnusCloud/controllers/plugin_translate.py.bak
	new file:   web/CygnusCloud/cron/crontab
	new file:   web/CygnusCloud/cron/crontab.example
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_ClassGroup.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_Subjects.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_UserGroup.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_VMByGroup.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_cas.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_event.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_group.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_membership.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_permission.table
	new file:   web/CygnusCloud/databases/061e7fe6f37aa3c49843eaaf42f77908_auth_user.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_ClassGroup.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_Subjects.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_UserGroup.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_VMByGroup.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_auth_cas.table
	new file:   web/CygnusCloud/databases/3cd1f3db30e36a38add97c0dd167f731_auth_event.table
Añado gestion de login y logout de usuarios, terminadas páginas de inicio de sesión y Acerca de. Creo barra de usuario iniciado
Voy a empezar con el arranque de máquinas para estudiantes
	modified:   web/CygnusCloud/controllers/main.py
	modified:   web/CygnusCloud/controllers/main.py.bak
	new file:   web/CygnusCloud/controllers/student.py
	new file:   web/CygnusCloud/controllers/student.py.bak
	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/models/menu.py
	modified:   web/CygnusCloud/models/menu.py.bak
	modified:   web/CygnusCloud/models/plugin_translate.py
	modified:   web/CygnusCloud/models/plugin_translate.py.bak
	modified:   web/CygnusCloud/progress.log
	new file:   web/CygnusCloud/sessions/127.0.0.1-dee08b32-fb5f-41b9-92ab-ea89938c46b9
	new file:   web/CygnusCloud/static/info.html
	new file:   web/CygnusCloud/static/info.html.bak
	modified:   web/CygnusCloud/views/layout.html
	modified:   web/CygnusCloud/views/layout.html.bak
	new file:   web/CygnusCloud/views/main/about.html
	new file:   web/CygnusCloud/views/main/about.html.bak
	new file:   web/CygnusCloud/views/student/runVM.html
	new file:   web/CygnusCloud/views/student/runVM.html.bak
Subo lo que he hecho hoy
	new file:   web/CygnusCloud/controllers/administrator.py
	new file:   web/CygnusCloud/controllers/administrator.py.bak
	modified:   web/CygnusCloud/controllers/main.py
	modified:   web/CygnusCloud/controllers/main.py.bak
	modified:   web/CygnusCloud/languages/es.py
	new file:   web/CygnusCloud/modules/database/.directory
	new file:   web/CygnusCloud/modules/database/systemStatusDB/__init__.py
	new file:   web/CygnusCloud/modules/database/systemStatusDB/systemStatusDBReader.py
	new file:   web/CygnusCloud/modules/database/systemStatusDB/systemStatusDBWriter.py
	new file:   web/CygnusCloud/modules/database/utils/__init__.py
	new file:   web/CygnusCloud/modules/database/utils/configuration.py
	new file:   web/CygnusCloud/modules/database/utils/connector.py
	new file:   web/CygnusCloud/modules/databaseUpdateThread.py
	new file:   web/CygnusCloud/modules/mainServer/connector/__init__.py
	new file:   web/CygnusCloud/modules/mainServer/connector/databaseUpdateThread.py
	new file:   web/CygnusCloud/modules/mainServer/connector/mainServerConnector.py#
	new file:   web/CygnusCloud/modules/mainServer/packets.py
	new file:   web/CygnusCloud/modules/mainServerConnector.py.bak
	new file:   web/CygnusCloud/modules/network/manager.py
	modified:   web/CygnusCloud/progress.log
	modified:   web/CygnusCloud/sessions/127.0.0.1-dee08b32-fb5f-41b9-92ab-ea89938c46b9
	new file:   web/CygnusCloud/views/administrator/runVM.html
	new file:   web/CygnusCloud/views/administrator/runVM.html.bak
	new file:   web/CygnusCloud/views/administrator/servers.html
	new file:   web/CygnusCloud/views/administrator/servers.html.bak
	new file:   web/CygnusCloud/views/administrator/servers/add_remove_servers.html.bak
Subo lo que llevo de hoy
	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/controllers/administrator.py.bak
	modified:   web/CygnusCloud/controllers/main.py
	modified:   web/CygnusCloud/controllers/main.py.bak
	modified:   web/CygnusCloud/controllers/plugin_translate.py
	modified:   web/CygnusCloud/controllers/plugin_translate.py.bak
	modified:   web/CygnusCloud/languages/default.py
	modified:   web/CygnusCloud/languages/es.py
	modified:   web/CygnusCloud/languages/fr.py
	modified:   web/CygnusCloud/models/menu.py
	modified:   web/CygnusCloud/models/menu.py.bak
	modified:   web/CygnusCloud/models/plugin_translate.py
	modified:   web/CygnusCloud/models/plugin_translate.py.bak
	modified:   web/CygnusCloud/modules/__init__.py
	new file:   web/CygnusCloud/modules/database/__init__.py
	new file:   web/CygnusCloud/modules/database/mainServer/__init__.py
	new file:   web/CygnusCloud/modules/database/mainServer/mainServerDB.py
	new file:   web/CygnusCloud/modules/database/mainServer/mainServerDB.py.bak
	new file:   web/CygnusCloud/modules/mainServer/__init__.py
	modified:   web/CygnusCloud/modules/mainServer/connector/databaseUpdateThread.py#
	new file:   web/CygnusCloud/modules/mainServer/connector/databaseUpdateThread.py.1
	new file:   web/CygnusCloud/modules/mainServer/connector/databaseUpdateThread.py.bak
	modified:   web/CygnusCloud/modules/mainServer/connector/mainServerConnector.py
	new file:   web/CygnusCloud/modules/mainServer/connector/mainServerConnector.py.bak
	new file:   web/CygnusCloud/modules/mainServer/connector/webCallback.py
	new file:   web/CygnusCloud/modules/mainServer/connector/webCallback.py.bak
	modified:   web/CygnusCloud/modules/mainServer/packets.py
	new file:   web/CygnusCloud/modules/mainServer/packets.py.bak
	new file:   web/CygnusCloud/modules/network/__init__.py
	new file:   web/CygnusCloud/modules/network/connection.py
	new file:   web/CygnusCloud/modules/network/connection.py.bak
	new file:   web/CygnusCloud/modules/network/exceptions/__init__.py
	new file:   web/CygnusCloud/modules/network/exceptions/networkManager.py
	new file:   web/CygnusCloud/modules/network/exceptions/packetException.py
	new file:   web/CygnusCloud/modules/network/interfaces/__init__.py
	new file:   web/CygnusCloud/modules/network/interfaces/ipAddresses.py
	modified:   web/CygnusCloud/modules/network/manager.py
	new file:   web/CygnusCloud/modules/network/manager.py.bak
	new file:   web/CygnusCloud/modules/network/packet.py
	new file:   web/CygnusCloud/modules/network/packet.py.bak
	new file:   web/CygnusCloud/modules/network/protocols.py
	new file:   web/CygnusCloud/modules/network/protocols.py.bak
	new file:   web/CygnusCloud/modules/network/tests/ConvCallback.py
	new file:   web/CygnusCloud/modules/network/tests/MultiClients.py
	new file:   web/CygnusCloud/modules/network/tests/__init__.py
	new file:   web/CygnusCloud/modules/network/tests/client01.py
	new file:   web/CygnusCloud/modules/network/tests/client03.py
	new file:   web/CygnusCloud/modules/network/tests/client04.py
	new file:   web/CygnusCloud/modules/network/tests/clientConversational.py
	new file:   web/CygnusCloud/modules/network/tests/clientEmisor.py
	new file:   web/CygnusCloud/modules/network/tests/clientReceptor.py
	new file:   web/CygnusCloud/modules/network/tests/dummyCallback.py
	new file:   web/CygnusCloud/modules/network/tests/packet.py
	new file:   web/CygnusCloud/modules/network/tests/server01.py
	new file:   web/CygnusCloud/modules/network/tests/server02.py
	new file:   web/CygnusCloud/modules/network/tests/server03.py
	new file:   web/CygnusCloud/modules/network/tests/server04.py
	new file:   web/CygnusCloud/modules/network/tests/serverConversational.py
	new file:   web/CygnusCloud/modules/network/tests/serverWridge.py
	new file:   web/CygnusCloud/modules/network/tests/tmp.py
	new file:   web/CygnusCloud/modules/network/threads/__init__.py
	new file:   web/CygnusCloud/modules/network/threads/connectionMonitoring.py
	new file:   web/CygnusCloud/modules/network/threads/connectionMonitoring.py.bak
	new file:   web/CygnusCloud/modules/network/threads/dataProcessing.py
	new file:   web/CygnusCloud/modules/network/threads/dataProcessing.py.bak
	new file:   web/CygnusCloud/modules/network/threads/server.py
	new file:   web/CygnusCloud/modules/network/threads/twistedReactor.py
	new file:   web/CygnusCloud/modules/utils1/__init__.py
	new file:   web/CygnusCloud/modules/utils1/commands.py
	new file:   web/CygnusCloud/modules/utils1/enums.py
	new file:   web/CygnusCloud/modules/utils1/multithreadingCounter.py
	new file:   web/CygnusCloud/modules/utils1/multithreadingDictionary.py
	new file:   web/CygnusCloud/modules/utils1/multithreadingList.py
	new file:   web/CygnusCloud/modules/utils1/multithreadingPriorityQueue.py
	new file:   web/CygnusCloud/modules/utils1/threads.py
	modified:   web/CygnusCloud/progress.log
	new file:   web/CygnusCloud/sessions/127.0.0.1-7eca9292-75b1-4a63-9d55-e6f3d609f996
	new file:   web/CygnusCloud/static/Certificados/Readme.txt
	new file:   web/CygnusCloud/static/Certificados/server.crt
	new file:   web/CygnusCloud/static/Certificados/server.csr
	new file:   web/CygnusCloud/static/Certificados/server.key
	new file:   web/CygnusCloud/static/Certificados/server_original.crt
	new file:   web/CygnusCloud/static/Certificados/server_original.key
	modified:   web/CygnusCloud/views/administrator/servers.html
	modified:   web/CygnusCloud/views/administrator/servers.html.bak
	new file:   web/CygnusCloud/views/administrator/users.html
	new file:   web/CygnusCloud/views/administrator/users.html.bak
Merge branch 'infrastructure-upstream' into web_development
Merge branch 'infrastructure-upstream' into web_development
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
Merge branch 'infrastructure-upstream' into web_development
Borro basura
Merge branch 'infrastructure-upstream' into web_development
Subo lo que llevo
	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/controllers/administrator.py.bak
	modified:   web/CygnusCloud/controllers/main.py
	modified:   web/CygnusCloud/controllers/main.py.bak
Merge branch 'web_development' of https://github.com/lbarriosh/cygnus-cloud into web_development
Subo el código de la web con las páginas de gestión de servidores completamente implementadas (no he podido probarlas) y la conexión con el servidor principal metida.
 Me da una excepción al conectarse
	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/languages/es.py
	modified:   web/CygnusCloud/models/db.py
	new file:   web/CygnusCloud/modules/ccutils/commands.py
	new file:   web/CygnusCloud/modules/ccutils/enums.py
	new file:   web/CygnusCloud/modules/ccutils/multithreadingCounter.py
	new file:   web/CygnusCloud/modules/ccutils/multithreadingDictionary.py
	new file:   web/CygnusCloud/modules/ccutils/multithreadingList.py
	new file:   web/CygnusCloud/modules/ccutils/multithreadingPriorityQueue.py
	new file:   web/CygnusCloud/modules/ccutils/rootPasswordHandler.py
	new file:   web/CygnusCloud/modules/ccutils/threads.py
	modified:   web/CygnusCloud/modules/clusterServer/connector/clusterServerConnector.py
	modified:   web/CygnusCloud/modules/clusterServer/connector/clusterServerConnector.py.bak
	modified:   web/CygnusCloud/modules/clusterServer/connector/databaseUpdateThread.py
	modified:   web/CygnusCloud/modules/clusterServer/networking/packets.py
	modified:   web/CygnusCloud/modules/database/SystemStatusDB.sql
	modified:   web/CygnusCloud/modules/database/clusterServer/clusterServerDB.py
	modified:   web/CygnusCloud/modules/database/systemStatusDB/systemStatusDBReader.py
	modified:   web/CygnusCloud/modules/database/systemStatusDB/systemStatusDBWriter.py
	modified:   web/CygnusCloud/modules/database/utils/connector.py
	modified:   web/CygnusCloud/modules/network/networkManager.py
	modified:   web/CygnusCloud/modules/network/packets/packet.py
	modified:   web/CygnusCloud/modules/network/threads/connectionMonitoring.py
	modified:   web/CygnusCloud/modules/network/threads/dataProcessing.py
	modified:   web/CygnusCloud/modules/network/twistedInteraction/connection.py
	modified:   web/CygnusCloud/modules/network/twistedInteraction/protocols.py
	new file:   web/CygnusCloud/modules/serverConnector/__init__.py
	new file:   web/CygnusCloud/modules/serverConnector/constants.py
	new file:   web/CygnusCloud/modules/serverConnector/singletonServerConnector.py
Algunas vistas de distintas partes de la web.
Falta agregarlas dinamismo
Merge branch 'infrastructure-upstream' into web_development
Subo lo que he conseguido hasta el momento. Da error por instanciar varias veces el reactor

	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/controllers/administrator.py.bak
	new file:   web/CygnusCloud/controllers/init.py
	modified:   web/CygnusCloud/controllers/main.py.bak
	modified:   web/CygnusCloud/languages/es.py
	new file:   web/CygnusCloud/models/__init__.py
	modified:   web/CygnusCloud/models/db.py
	modified:   web/CygnusCloud/models/db.py.1
	modified:   web/CygnusCloud/models/db.py.bak
	modified:   web/CygnusCloud/modules/clusterServer/connector/clusterServerConnector.py
	modified:   web/CygnusCloud/modules/clusterServer/connector/clusterServerConnector.py.bak
	modified:   web/CygnusCloud/modules/serverConnector/singletonServerConnector.py
	modified:   web/CygnusCloud/progress.log
Merge branch 'web_development' of https://github.com/lbarriosh/cygnus-cloud into web_development
Subo lo que he conseguido hoy
	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/controllers/administrator.py.bak
	modified:   web/CygnusCloud/controllers/main.py
	modified:   web/CygnusCloud/controllers/main.py.bak
	modified:   web/CygnusCloud/controllers/student.py
	modified:   web/CygnusCloud/controllers/student.py.bak
	modified:   web/CygnusCloud/modules/network/networkManager.py