android y programa ajuste pid
Merge branch 'intento-reparacion-de-problemas-de-alimentacion'

Conflicts:
	software/quadcoper/quad.X/CB_Bluetooth.c
	software/quadcoper/quad.X/CB_Bluetooth.h
	software/quadcoper/quad.X/build/default/production/CA_SetGetMPU6050.o
	software/quadcoper/quad.X/build/default/production/CA_calibrado_y_filtros.o
	software/quadcoper/quad.X/build/default/production/CA_funciones_control.o
	software/quadcoper/quad.X/build/default/production/CB_Bluetooth.o
	software/quadcoper/quad.X/build/default/production/CB_I2C.o
	software/quadcoper/quad.X/build/default/production/CB_Inicializaciones.o
	software/quadcoper/quad.X/build/default/production/CB_Timer1.o
	software/quadcoper/quad.X/build/default/production/CB_Timer2.o
	software/quadcoper/quad.X/build/default/production/CB_Timer3.o
	software/quadcoper/quad.X/build/default/production/CB_Timer5.o
	software/quadcoper/quad.X/build/default/production/Pruebas.o
	software/quadcoper/quad.X/build/default/production/main.o
	software/quadcoper/quad.X/dist/default/production/quad.X.production.elf
	software/quadcoper/quad.X/dist/default/production/quad.X.production.hex
	software/quadcoper/quad.X/dist/default/production/quad.X.production.map
	software/quadcoper/quad.X/nbproject/Makefile-default.mk
	software/quadcoper/quad.X/nbproject/Makefile-local-default.mk
	software/quadcoper/quad.X/nbproject/configurations.xml
	software/quadcoper/quad.X/nbproject/private/configurations.xml
	software/quadcoper/quad.X/variables_globales.h