Quito las referencias a websockify y añado las modificaciones al archivo de configuración para crear el websocket
	modified:   configurationFiles/configurationFileParser.py
	modified:   database/VMServerDB.sql
	modified:   database/vmServerDB.py
	modified:   reactor/vmServerReactor.py
Quito la ruta de websockify del archivo de configuración
	modified:   VMServer_settings.conf
Subo lo que faltaba de quitar toda referencia a websockify
	modified:   ../src/Infraestructura/virtualMachineServer/libvirtInteraction/configurationFileEditor.py
	modified:   ../src/Infraestructura/virtualMachineServer/libvirtInteraction/domainHandler.py
Integro el código del servidor de máquinas virtuales con websockets con el resto
de código del servidor de máquinas virtuales.

Merge branch 'websockets' into websockets_integration

Conflicts:
	Ficheros de configuración /VMServer_settings.conf
	src/Infraestructura/virtualMachineServer/configurationFiles/configurationFileParser.py

 Changes to be committed:
	modified:   "Ficheros de configuraci\303\263n /VMServer_settings.conf"
	modified:   src/Infraestructura/virtualMachineServer/configurationFiles/configurationFileParser.py
	modified:   src/Infraestructura/virtualMachineServer/database/VMServerDB.sql
	modified:   src/Infraestructura/virtualMachineServer/database/vmServerDB.py
	modified:   src/Infraestructura/virtualMachineServer/libvirtInteraction/configurationFileEditor.py
	modified:   src/Infraestructura/virtualMachineServer/libvirtInteraction/domainHandler.py
	modified:   src/Infraestructura/virtualMachineServer/reactor/vmServerReactor.py
Subo los refactors que he ido haciendo a medida que escribía la memoria.

 On branch websockets_integration
 Changes to be committed:

	renamed:    src/Infraestructura/virtualMachineServer/libvirtInteraction/configurationFileEditor.py -> src/Infraestructura/virtualMachineServer/libvirtInteraction/definitionFileEditor.py
	modified:   src/Infraestructura/virtualMachineServer/libvirtInteraction/domainHandler.py
	new file:   src/Infraestructura/virtualMachineServer/libvirtInteraction/domainStartCallback.py
	new file:   src/Infraestructura/virtualMachineServer/libvirtInteraction/domainStopCallback.py
	modified:   src/Infraestructura/virtualMachineServer/libvirtInteraction/libvirtConnector.py
	deleted:    src/Infraestructura/virtualMachineServer/reactor/clusterServerCallback.py
	deleted:    src/Infraestructura/virtualMachineServer/reactor/clusterServerPacketReactor.py
	modified:   src/Infraestructura/virtualMachineServer/reactor/vmServerReactor.py
	new file:   src/Infraestructura/virtualMachineServer/threads/fileTransferCallback.py
	modified:   src/Infraestructura/virtualMachineServer/threads/fileTransferThread.py
Subo las modificaciones que he introducido al escribir la memoria.

 On branch websockets_integration
 Changes to be committed:

	modified:   src/Infraestructura/virtualMachineServer/libvirtInteraction/domainHandler.py
	modified:   src/Infraestructura/virtualMachineServer/reactor/vmServerReactor.py
Cierro el issue #151.

 On branch websockets_integration
 Changes to be committed:

	modified:   "Ficheros de configuraci\303\263n /VMServer_settings.conf"
	modified:   src/Infraestructura/virtualMachineServer/configurationFiles/configurationFileParser.py
	modified:   src/Infraestructura/virtualMachineServer/reactor/vmServerReactor.py
	modified:   src/Infraestructura/virtualMachineServer/threads/fileTransferThread.py
Cierro el issue #153.

 On branch websockets_integration
 Changes to be committed:

	modified:   src/Infraestructura/virtualMachineServer/threads/compressionThread.py
	modified:   src/Infraestructura/virtualMachineServer/threads/fileTransferCallback.py
	modified:   src/Infraestructura/virtualMachineServer/threads/fileTransferThread.py
Subo las modificaciones que he hecho al escribir la memoria.

 On branch websockets_integration
 Changes to be committed:

	modified:   src/Infraestructura/virtualMachineServer/packetHandling/packetHandler.py
	modified:   src/Infraestructura/virtualMachineServer/packetHandling/packet_t.py
	modified:   src/Infraestructura/virtualMachineServer/threads/compressionThread.py
Corrijo los issues #150 y #163.

 On branch websockets_integration
 Changes to be committed:

	modified:   "Ficheros de configuraci\303\263n /VMServer_settings.conf"
	modified:   src/Infraestructura/testing/clusterServerTester.py
	modified:   src/Infraestructura/testing/imageRepositoryTester.py
	modified:   src/Infraestructura/testing/virtualMachineServerTester.py
	modified:   src/Infraestructura/virtualMachineServer/configurationFiles/configurationFileParser.py
	modified:   src/Infraestructura/virtualMachineServer/database/VMServerDB.sql
	modified:   src/Infraestructura/virtualMachineServer/database/vmServerDB.py
	modified:   src/Infraestructura/virtualMachineServer/libvirtInteraction/definitionFileEditor.py
	modified:   src/Infraestructura/virtualMachineServer/libvirtInteraction/domainHandler.py
	modified:   src/Infraestructura/virtualMachineServer/reactor/vmServerReactor.py
Merge branch 'websockets_integration' into develop