merging issues
merge to alternate workstation
nope:
Merge branch 'observer' of https://github.com/CapnKernul/morcontrol into observer

Conflicts:
	resources/META-INF/MANIFEST.MF
	src/com/bhrobotics/morcontrol/AsyncOIServer.java
	src/com/bhrobotics/morcontrol/RobotMIDlet.java
	src/com/bhrobotics/morcontrol/devices/input/AnalogInput.java
	src/com/bhrobotics/morcontrol/devices/input/DigitalInput.java
	src/com/bhrobotics/morcontrol/devices/input/Encoder.java
	src/com/bhrobotics/morcontrol/devices/registry/AnalogInputRegistry.java
	src/com/bhrobotics/morcontrol/devices/registry/BasicDeviceIndex.java
	src/com/bhrobotics/morcontrol/devices/registry/BasicDeviceRegistry.java
	src/com/bhrobotics/morcontrol/devices/registry/DeviceRegistry.java
	src/com/bhrobotics/morcontrol/devices/registry/DigitalInputRegistry.java
	src/com/bhrobotics/morcontrol/devices/registry/EncoderRegistry.java
	src/com/bhrobotics/morcontrol/devices/registry/PWMRegistry.java
	src/com/bhrobotics/morcontrol/devices/registry/Registry.java
	src/com/bhrobotics/morcontrol/devices/registry/RelayRegistry.java
	src/com/bhrobotics/morcontrol/devices/registry/SolenoidRegistry.java
	src/com/bhrobotics/morcontrol/io/DeviceService.java
Merge branch 'observer' of https://github.com/CapnKernul/morcontrol into observer

Conflicts:
	resources/META-INF/MANIFEST.MF
	src/com/bhrobotics/morcontrol/AsyncOIServer.java
	src/com/bhrobotics/morcontrol/AsyncThread.java
	src/com/bhrobotics/morcontrol/BlockingServerThread.java
	src/com/bhrobotics/morcontrol/OIServer.java
	src/com/bhrobotics/morcontrol/RobotMIDlet.java
	src/com/bhrobotics/morcontrol/io/ThreadState.java
switching