Termino la página de administrador que muestra las máquinas virtuales arrancadas
	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/languages/es.py
	modified:   web/CygnusCloud/progress.log
Merge branch 'web_development' of https://github.com/lbarriosh/cygnus-cloud into web_development
Corrijo algún bug de la página de máquinas arrancadas para el servidor. Compruebo su funcionamiento con una máquina virtual.
 No consigo lanzar el servidor de MV con 2 máquinas virtuales arrancadas.
	modified:   web/CygnusCloud/controllers/administrator.py
	modified:   web/CygnusCloud/progress.log
Merge branch 'issues_10_11' into web_development
Merge branch 'issue_14' into web_development
Merge branch 'issue_6' into web_development
Merge branch 'issue_8' into web_development
Merge branch 'issue_18' into web_development
Codígo con el conector de la última versión añadido y funcional. Hay un bug al intentar mostrar la descripción
de una máquina en la página de administrador.
	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/languages/es.py
	modified:   web/CygnusCloud/modules/ccutils/commands.py
	modified:   web/CygnusCloud/modules/ccutils/threads.py
	modified:   web/CygnusCloud/modules/clusterServer/connector/clusterServerConnector.py
	modified:   web/CygnusCloud/modules/clusterServer/connector/commandsHandler.py
	new file:   web/CygnusCloud/modules/clusterServer/connector/tests/__init__.py
	new file:   web/CygnusCloud/modules/clusterServer/connector/tests/commandsHandlerTests.py
	new file:   web/CygnusCloud/modules/clusterServer/connector/webServerEndpoint.py
	modified:   web/CygnusCloud/modules/clusterServer/networking/callbacks.py
	modified:   web/CygnusCloud/modules/clusterServer/networking/packets.py
	new file:   web/CygnusCloud/modules/database/ClusterServerDB.sql
	modified:   web/CygnusCloud/modules/database/clusterServer/clusterServerDB.py
	modified:   web/CygnusCloud/modules/database/commands/commandsDatabaseConnector.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/progress.log
Bug en la descricpión de las máquinas para el administrador corregido

	modified:   web/CygnusCloud/controllers/administrator.py
Añado el código con el muestreo de la descripción relativo a la casilla seleccionada utilizando JQuery. De momento el botón arrancar surge
debajo de la descripción de la MV seleccionada. Falta ajustar algunos estilos para que se vea menjor (separar campos de las tablas)

	modified:   CygnusCloud/controllers/administrator.py
	modified:   CygnusCloud/controllers/administrator.py.bak
	modified:   CygnusCloud/controllers/student.py
	modified:   CygnusCloud/controllers/student.py.bak
	modified:   CygnusCloud/languages/es.py
	modified:   CygnusCloud/progress.log
	modified:   CygnusCloud/views/administrator/runVM.html
	modified:   CygnusCloud/views/administrator/runVM.html.bak
	modified:   CygnusCloud/views/student/runVM.html
	modified:   CygnusCloud/views/student/runVM.html.bak
Merge branch 'infrastructure-upstream' into web_development
Integracion de noVNC en la web
Subo la web con la funcionalidad de noVNC enlazada. Añado mensajes de error de interacción con el conector  y corrijo algún bug
	modified:   CygnusCloud/controllers/administrator.py
	modified:   CygnusCloud/controllers/student.py
	modified:   CygnusCloud/controllers/vncClient.py
	modified:   CygnusCloud/languages/es.py
	modified:   CygnusCloud/languages/it.py
	modified:   CygnusCloud/languages/nl.py
	modified:   CygnusCloud/views/administrator/runVM.html
	modified:   CygnusCloud/views/vncClient/VNCPage.html
Merge branch 'vm_server_cleanup' into web_development
Subo cosas que se me olvidaron ayer.

 Changes to be committed:
	modified:   database/tests/vmServerDBTests.py
	modified:   database/vmServer/vmServerDB.py
	modified:   virtualMachineServer/vmServer.py
Subo el último cambio que tenía pendiente
 On branch web_development

	modified:   virtualMachineServer/vmServer.py
Sigo subiendo cosas que se me han pasado
 On branch web_development
 Changes to be committed:

	modified:   database/tests/vmServerDBTests.py
	modified:   database/vmServer/vmServerDB.py