Termino de mezclar todas las ramas. Acabo con la limpieza de la base de datos.

 On branch mainserver-upstream
 Changes to be committed:

	modified:   src/CygnusCloud/database/mainServer/mainServerDB.py
	renamed:    src/CygnusCloud/database/DBTests/DBVMServerTest.sql -> src/CygnusCloud/database/tests/VMServerDBTest.sql
	renamed:    src/CygnusCloud/database/DBTests/DBVMServerTests.py -> src/CygnusCloud/database/tests/vmServerDBTests.py
	modified:   src/CygnusCloud/database/utils/connector.py
	new file:   src/CygnusCloud/database/vmServer/__init__.py
	new file:   src/CygnusCloud/database/vmServer/imageManager.py
	renamed:    src/CygnusCloud/database/VMServerDB/RuntimeData.py -> src/CygnusCloud/database/vmServer/runtimeData.py
	modified:   src/CygnusCloud/database/webServer/userAccess.py
	modified:   src/CygnusCloud/database/webServer/userManagement.py
	modified:   src/CygnusCloud/utils/commands.py
	modified:   src/CygnusCloud/virtualMachineServer/VMClient.py