Closed #2.
~
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/smarthouselib/db/Controller.java
	src/smarthouselib/db/Device.java