Merge remote-tracking branch 'origin/master'

# Conflicts:
#	easyplugin-all/pom.xml
#	easyplugin-bom/pom.xml
#	easyplugin-command/pom.xml
#	easyplugin-common/pom.xml
#	easyplugin-configuration/pom.xml
#	easyplugin-database/pom.xml
#	easyplugin-gui/pom.xml
#	easyplugin-lp/pom.xml
#	easyplugin-main/pom.xml
#	easyplugin-placeholderapi/pom.xml
#	easyplugin-vault/pom.xml
#	pom.xml

easyplugin-configuration/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>easyplugin-parent</artifactId>
         <groupId>cc.carm.lib</groupId>
-        <version>1.3.6</version>
+        <version>1.3.8</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -69,7 +69,7 @@
             <optional>true</optional>
             <scope>compile</scope>
         </dependency>
-        
+
     </dependencies>
 
     <build>