Fix some minor fix in GUI demo
add image for termostat
fix bug in GUI demo in mode=noserver
fix
Fixed bug in service registration
sync
Merge branch 'master' of https://github.com/Tophans/jemma
Merge branch 'master' of https://github.com/consoftenergyathome/jemma

Conflicts:
	jemma.osgi.ah.greenathome/src/main/java/org/energy_home/jemma/ah/internal/greenathome/GreenathomeAppliance.java