fixed bug in registering device

Signed-off-by: gormed <hans.ferchland@gmx.de>
Merge branch 'master' into appHardware-Services

Conflicts:
	iseesomethingyoudont/src/com/ubicomp/iseesomethingyoudont/ControlActivity.java

Signed-off-by: gormed <hans.ferchland@gmx.de>