Added defaultgoal in pom
Changed default execution phase to generate target platform
Added missing tag in pom
Adding m2 lifecycle mapping
Added WhiteGoodApplianceFactory in Activator
Added properties to run jemma in config.ini generator
Merge remote-tracking branch 'upstream/master'
Merge pull request #137 from ivangrimaldi/master

Changed assembly lifecycle mapping and other minor fixes
Merged changes from marcoNieddu/jemma
Added getChangeCount method for compliancy to OSGi R5 specs
Modified equinox version. Added felix gogo.* dependencies for console
support.
Updated jetty and equinox.jetty versions and added jetty-websocket
Merge branch 'master' of github.com:marcoNieddu/jemma into marcoNieddu-master

Conflicts:
	jemma.osgi.ah.energyathome/src/main/java/org/energy_home/jemma/ah/ebrain/MeteringCore.java
	jemma.osgi.ah.energyathome/src/main/java/org/energy_home/jemma/internal/ah/eh/esp/ESPApplication.java
	jemma.osgi.ah.greenathome/src/main/java/org/energy_home/jemma/ah/internal/greenathome/GreenathomeAppliance.java
	jemma.osgi.ah.hac.lib/src/main/java/org/energy_home/jemma/ah/cluster/zigbee/closures/WindowCoveringServer.java
	jemma.osgi.ah.hap.client/src/main/java/org/energy_home/jemma/shal/DeviceDescriptor.java
	jemma.osgi.ah.zigbee.appliances/src/main/java/org/energy_home/jemma/ah/zigbee/appliances/Activator.java
	jemma.osgi.ah.zigbee.appliances/src/main/java/org/energy_home/jemma/ah/zigbee/appliances/ZclDoorLockAppliance.java
	jemma.osgi.ah.zigbee.appliances/src/main/java/org/energy_home/jemma/ah/zigbee/appliances/ZigbeeWhiteGoodApplianceFactory.java
	jemma.osgi.ah.zigbee/src/main/java/org/energy_home/jemma/ah/zigbee/zcl/lib/ZclServiceClusterFactory.java
Merge branch 'marcoNieddu-master'
Merge pull request #151 from marcoNieddu/master

Bugfix and improved performance
New target platform definition, updated jetty dependencies
Merge remote-tracking branch 'upstream/master'

Conflicts:
	jemma.launch/javagal Windows.launch
Merge pull request #152 from marcoNieddu/master

BugFix
Merge remote-tracking branch 'upstream/master'
Added missing imports
Removed unused and wrong import