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
Merge branch 'master' of https://github.com/consoftenergyathome/jemma
Merge pull request #1 from Tophans/master

Fix Bug in demo GUI
sync
sync
synch
sync
Changes to the photovoltaic GUI to manage the "noserver" option
(devices read form the noserver.properties configuration file)
Management of "noserver" configuration - bug fixing
Missing import in GreenathomeAppliance.java bug fixing
Change to manage the "storico" page in noserver mode.
Merge pull request #2 from bruno-vignola/master

Management of the noserver configuration
Merge pull request #175 from consoftenergyathome/master

Bug Fixes on GUI and mode=noserver