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

admin/pom.xml

@@ -68,7 +68,7 @@
         <resources>
             <resource>
                 <directory>src/main/resources</directory>
-                <filtering>true</filtering>
+                <filtering>false</filtering>
                 <includes>
                     <include>**/*.*</include>
                 </includes>