Merge branch 'master' of https://github.com/charithag/product-iot-server

# Conflicts:
#	modules/samples/doormanager/component/pom.xml

modules/samples/doormanager/component/pom.xml

@@ -273,11 +273,11 @@
             </dependency>
         </dependencies>
     </dependencyManagement>
-  <modules>
+    <modules>
-    <module>plugin</module>
+        <module>plugin</module>
-    <module>controller</module>
+        <module>controller</module>
-    <module>manager</module>
+        <module>manager</module>
-    <module>analytics</module>
+        <module>analytics</module>
-    <module>ui</module>
+        <module>ui</module>
-  </modules>
+    </modules>
 </project>

modules/tools/cdmf-devicetype-archetype/pom.xml

@@ -20,7 +20,7 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>org.wso2.iot</groupId>
-        <artifactId>wso2iot-parent</artifactId>
+        <artifactId>wso2cdmf-tools</artifactId>
         <version>1.0.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>