Second commit.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/smarthouse/DeviceCapabilities.java
	src/smarthouse/DeviceState.java
	src/smarthouse/IToggleable.java
	src/smarthouselib/DeviceCapabilities.java
	src/smarthouselib/DeviceState.java
	src/smarthouselib/IDevice.java
	src/smarthouselib/IDimmable.java
	src/smarthouselib/IToggleable.java
	src/smarthouselib/devices/DeviceCapabilities.java
	src/smarthouselib/devices/DeviceState.java
	src/smarthouselib/devices/DimmableLamp.java
	src/smarthouselib/devices/IToggleable.java
	src/smarthouselib/devices/Lamp.java
	src/smarthouselib/drivers/ArturoLampDriver.java
	src/smarthouselib/drivers/IToggleableDriver.java
	src/smarthouselib/drivers/SimpleDeviceFactory.java
	src/smarthouselib/drivers/WorldTechLampDriver.java