NuwanSameera ab7ee2dbb8 Merge remote-tracking branch 'origin/master' ... Conflicts: modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/transport/ConnectedCupMQTTConnector.java modules/samples/connectedcup/component/api/src/main/java/org/coffeeking/api/util/ConnectedCupServiceUtils.java modules/samples/connectedcup/component/controller/src/main/java/org/coffeeking/controller/service/ConnectedCupControllerService.java modules/samples/connectedcup/component/manager/src/main/java/org/coffeeking/manager/service/ConnectedCupManagerService.java modules/samples/connectedcup/component/manager/src/main/webapp/WEB-INF/cxf-servlet.xml modules/samples/currentsensor/component/api/src/main/java/org/homeautomation/currentsensor/api/util/CurrentSensorServiceUtils.java modules/samples/currentsensor/component/controller/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorControllerService.java modules/samples/currentsensor/component/manager/src/main/java/org/homeautomation/currentsensor/manager/api/CurrentSensorManagerService.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/constants/CurrentSensorConstants.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManager.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/CurrentSensorManagerService.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/CurrentSensorDAOUtil.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/dao/impl/CurrentSensorDeviceDAOImpl.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/impl/util/CurrentSensorUtils.java modules/samples/currentsensor/component/plugin/src/main/java/org/homeautomation/currentsensor/plugin/internal/ServiceComponent.java modules/samples/firealarm/component/controller/src/main/java/org.homeautomation/firealarm/controller/api/ControllerService.java		2016-04-18 11:49:18 +05:30
..
agent	Merge remote-tracking branch 'origin/master'	2016-04-18 11:49:18 +05:30
analytics	Add Uninstall feature to sample device types.	2016-04-18 11:47:47 +05:30
api	Merge remote-tracking branch 'origin/master'	2016-04-18 11:49:18 +05:30
controller/src/main/webapp/META-INF	Merge remote-tracking branch 'origin/master'	2016-04-18 11:49:18 +05:30
manager/src/main	Merge remote-tracking branch 'origin/master'	2016-04-18 11:49:18 +05:30
plugin	Add Uninstall feature to sample device types.	2016-04-18 11:47:47 +05:30
ui	Merge remote-tracking branch 'origin/master'	2016-04-18 11:49:18 +05:30
pom.xml	Add Uninstall feature to sample device types.	2016-04-18 11:47:47 +05:30