Revert "Revert "problemas de funcionamiento""

This reverts commit 95f34b80f710f8cb768666257745b8db3288326b.

Conflicts:
	software/android/joystick/bin/classes.dex
	software/android/joystick/bin/classes/org/projectproto/btjoystick/BluetoothJoystickActivity$2.class
	software/android/joystick/bin/classes/org/projectproto/btjoystick/BluetoothJoystickActivity.class
	software/android/joystick/bin/classes/org/projectproto/btjoystick/BluetoothRfcommClient$ConnectThread.class
	software/android/joystick/bin/classes/org/projectproto/btjoystick/BluetoothRfcommClient$ConnectedThread.class
	software/android/joystick/bin/classes/org/projectproto/btjoystick/BluetoothRfcommClient.class
	software/android/joystick/bin/jarlist.cache
	software/android/joystick/bin/joystick.apk
	software/android/joystick/bin/resources.ap_
	software/quadcoper/Quadcopter.X/dist/default/production/Quadcopter.X.production.elf
	software/quadcoper/Quadcopter.X/dist/default/production/Quadcopter.X.production.hex
	software/quadcoper/Quadcopter.X/dist/default/production/Quadcopter.X.production.map
	software/quadcoper/Quadcopter.X/nbproject/Makefile-genesis.properties