Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	modules/i3plus-core-apiservice/src/main/resources/application-prod.properties
#	modules/i3plus-core-apiservice/src/main/resources/application-test.properties

modules/i3plus-core-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-core</artifactId>
         <groupId>i3plus.core</groupId>
-        <version>1.0-SNAPSHOT-DEV</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

modules/i3plus-core-apiservice/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>i3plus-core</artifactId>
         <groupId>i3plus.core</groupId>
-        <version>1.0-SNAPSHOT-DEV</version>
+        <version>1.0-DEV-SNAPSHOT</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

pom.xml

@@ -7,7 +7,7 @@
     <groupId>i3plus.core</groupId>
     <artifactId>i3plus-core</artifactId>
     <packaging>pom</packaging>
-    <version>1.0-SNAPSHOT-DEV</version>
+    <version>1.0-DEV-SNAPSHOT</version>
     <modules>
         <module>modules/i3plus-core-api</module>
         <module>modules/i3plus-core-apiservice</module>
@@ -28,9 +28,9 @@
         <java.version>1.8</java.version>
         <spring-cloud.version>Finchley.RELEASE</spring-cloud.version>
         <log4j2.level>INFO</log4j2.level>
-        <log4j2.root.path>E:/i3plus-platform-logs/${project.name}</log4j2.root.path>
+        <log4j2.root.path>../logs/${project.name}</log4j2.root.path>
-        <log4j2.error.path>E:/i3plus-platform-logs/${project.name}-error</log4j2.error.path>
+        <log4j2.error.path>../logs/${project.name}-error</log4j2.error.path>
-        <log4j2.package.path>E:/i3plus-platform-logs/${project.name}-controller</log4j2.package.path>
+        <log4j2.package.path>../logs/${project.name}-controller</log4j2.package.path>
         <maven-javadoc-plugin.version>2.9.1</maven-javadoc-plugin.version>
         <maven-jar-plugin.version>2.6</maven-jar-plugin.version>
         <maven-compiler-plugin.version>2.1</maven-compiler-plugin.version>