Merge branch 'dev_log' into dev_temp

# Conflicts:
#	epmet-auth/pom.xml

epmet-auth/epmet-auth-client/pom.xml → epmet-auth-client/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>epmet-auth</artifactId>
+        <artifactId>epmet-cloud</artifactId>
         <groupId>com.epmet</groupId>
         <version>2.0.0</version>
     </parent>

epmet-auth/pom.xml

@@ -3,9 +3,6 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <version>0.3.72</version>
-    <modules>
-        <module>epmet-auth-client</module>
-    </modules>
     <parent>
         <groupId>com.epmet</groupId>
         <artifactId>epmet-cloud</artifactId>
@@ -136,6 +133,11 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-auth-client</artifactId>
+            <version>2.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

pom.xml

@@ -25,6 +25,7 @@
 		<module>epmet-commons</module>
 		<module>epmet-gateway</module>
 		<module>epmet-auth</module>
+		<module>epmet-auth-client</module>
 		<module>epmet-admin</module>
 		<module>epmet-module</module>
 		<module>epmet-user</module>