Merged latest JavaGAL modifications
Merged with Master
Fixed versions in pom and re-generated manifests
Merge pull request #100 from marcoNieddu/master

Minor modifications
Merged with master and added logs
Changed log
BugFix on javaGalGui
BugFix on Gal
BugFix on JavaGal
Merge pull request #101 from marcoNieddu/master

BugFix on GAL and GalGui
Fixed bugs on Urmet device and js interface

Fixed LDAP string in Urmet Smoke detector appliance factory
Renamed appliance type expected in Indesit white goods javascript interface
Renamed appliance type expected in demo InterfaceEnergyHome for SmartInfo
Fixed bugs related to colorlights
Renamed wrong types for exceptions in javascript
Merge branch 'master' into logging-refactoring

Conflicts:
	jemma.launch/javagal Linux.launch
	jemma.osgi.ah.adapter.http/META-INF/MANIFEST.MF
	jemma.osgi.ah.app/META-INF/MANIFEST.MF
	jemma.osgi.ah.configurator/META-INF/MANIFEST.MF
	jemma.osgi.ah.energyathome/META-INF/MANIFEST.MF
	jemma.osgi.ah.felix.console.web/META-INF/MANIFEST.MF
	jemma.osgi.ah.greenathome/META-INF/MANIFEST.MF
	jemma.osgi.ah.hac.lib/META-INF/MANIFEST.MF
	jemma.osgi.ah.hac/META-INF/MANIFEST.MF
	jemma.osgi.ah.hap.client/META-INF/MANIFEST.MF
	jemma.osgi.ah.io/META-INF/MANIFEST.MF
	jemma.osgi.ah.m2m.device/META-INF/MANIFEST.MF
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/AccessRight.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/AccessRightItems.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/AccessRights.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/Container.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ContainerItems.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/Containers.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ContentInstance.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ContentInstanceItemStatus.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ContentInstanceItems.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ContentInstanceItemsList.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ContentInstanceItemsStatus.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ContentInstances.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ContentInstancesBatchRequest.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ContentInstancesBatchResponse.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/ObjectFactory.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/Scl.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/SclBase.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/SclItems.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/SclStatusEnumeration.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/Scls.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/Subscription.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/SubscriptionItems.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/Subscriptions.java
	jemma.osgi.ah.m2m.device/src/main/java/org/energy_home/jemma/m2m/package-info.java
	jemma.osgi.ah.upnp.energyathome/META-INF/MANIFEST.MF
	jemma.osgi.ah.webui.base/META-INF/MANIFEST.MF
	jemma.osgi.ah.webui.energyathome.demo/META-INF/MANIFEST.MF
	jemma.osgi.ah.webui.energyathome/META-INF/MANIFEST.MF
	jemma.osgi.ah.zigbee.appliances.generic/META-INF/MANIFEST.MF
	jemma.osgi.ah.zigbee.appliances/META-INF/MANIFEST.MF
	jemma.osgi.ah.zigbee/META-INF/MANIFEST.MF
	jemma.osgi.javagal.gui/META-INF/MANIFEST.MF
	jemma.osgi.javagal.json/META-INF/MANIFEST.MF
	jemma.osgi.javagal.rest/META-INF/MANIFEST.MF
	jemma.osgi.javagal.rest/src/main/java/org/energy_home/jemma/javagal/rest/RestClientManagerAndListener.java
	jemma.osgi.javagal/META-INF/MANIFEST.MF
	jemma.osgi.javagal/src/main/java/org/energy_home/jemma/javagal/layers/business/GalController.java
	jemma.osgi.javagal/src/main/java/org/energy_home/jemma/javagal/layers/business/implementations/Discovery_Freshness_ForcePing.java
	jemma.osgi.javagal/src/main/java/org/energy_home/jemma/javagal/layers/business/implementations/GatewayEventManager.java
	jemma.osgi.javagal/src/main/java/org/energy_home/jemma/javagal/layers/data/implementations/IDataLayerImplementation/DataFreescale.java
	jemma.osgi.javagal/src/main/java/org/energy_home/jemma/javagal/layers/data/implementations/SerialCommRxTx.java
	jemma.osgi.javagal/src/main/java/org/energy_home/jemma/javagal/layers/object/WrapperWSNNode.java
	jemma.osgi.utils/META-INF/MANIFEST.MF