sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma
sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma
Merge branch 'master' of https://github.com/marcoNieddu/jemma
sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma

Conflicts:
	jemma.osgi.ah.greenathome/src/main/java/org/energy_home/jemma/ah/greenathome/GreenAtHomeApplianceService.java
	jemma.osgi.ah.greenathome/src/main/java/org/energy_home/jemma/ah/internal/greenathome/GreenathomeAppliance.java
Merge branch 'master' of https://github.com/marcoNieddu/jemma
sync
Merge branch 'master' of https://github.com/marcoNieddu/jemma
bug fix in conf
Bug Fix
Merge pull request #19 from Tophans/master

BugFix