Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

pom.xml

@@ -180,7 +180,7 @@
 			<artifactId>istyle</artifactId>
 			<version>1.3</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/Istyle.jar</systemPath>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/Istyle-1.3.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>com.diquest.ir</groupId>