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

style24.front/.project

@@ -3,6 +3,7 @@
 	<name>style24.front</name>
 	<comment></comment>
 	<projects>
+		<project>style24.core</project>
 	</projects>
 	<buildSpec>
 		<buildCommand>

style24.front/target/m2e-wtp/web-resources/META-INF/MANIFEST.MF

@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Implementation-Title: style24.front
+Implementation-Version: 0.0.1-SNAPSHOT
+Build-Jdk-Spec: 1.8
+Created-By: Maven Integration for Eclipse
+