Merge branch 'pr/10'

Conflicts:
	src/com/heroicrobot/dropbit/registry/DeviceRegistry.java