Merged jemma.osgi.ah.io,  jemma.osgi.ah.webui.energyathome and jemma.osgi.ah.zigbee