Light agent link with gui
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/smarthouse/Main.java
	src/smarthouse/lightagent/LightAgent.java