GUI och controller kan prata med varandra
Merge branch 'master' of https://github.com/mindrage/HomeSys

Conflicts:
	Android/uWatch/bin/AndroidManifest.xml
	Android/uWatch/bin/classes.dex
	Android/uWatch/bin/classes/com/example/ufirstapp/Login_Activity.class
	Android/uWatch/bin/resources.ap_
	Android/uWatch/bin/uWatch.apk
	Android/uWatch/src/com/example/ufirstapp/Login_Activity.java
	Android/uWatch/src/com/uwatch/service/UwatchClient.java
	Server/uWatchServer/.classpath
	Server/uWatchServer/bin/.gitignore
	Server/uWatchServer/bin/Server/ServerController.class
	Server/uWatchServer/src/Server/ServerController.java