Merge branch 'master' of http://192.168.0.36:9090/shenjinzhu/change4weixin.git

.settings/org.eclipse.wst.common.component

-<?xml version="1.0" encoding="UTF-8"?><project-modules id="moduleCoreId" project-version="1.5.0">
-    <wb-module deploy-name="change4weixin-3.0.1-SNAPSHOT">
-        <wb-resource deploy-path="/" source-path="/target/m2e-wtp/web-resources"/>
-        <wb-resource deploy-path="/" source-path="/src/main/webapp" tag="defaultRootSource"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
-        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
-        <property name="context-root" value="change4weixin"/>
-        <property name="java-output-path" value="/change4weixin/target/classes"/>
-    </wb-module>
-</project-modules>

.settings/org.eclipse.wst.common.project.facet.core.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<faceted-project>
-  <runtime name="Apache Tomcat v7.0"/>
-  <fixed facet="wst.jsdt.web"/>
-  <installed facet="java" version="1.8"/>
-  <installed facet="jst.web" version="2.5"/>
-  <installed facet="wst.jsdt.web" version="1.0"/>
-</faceted-project>

.settings/org.eclipse.wst.jsdt.ui.superType.container

-org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file

.settings/org.eclipse.wst.jsdt.ui.superType.name

-Window
\ No newline at end of file

.settings/org.eclipse.wst.validation.prefs

-disabled=06target
-eclipse.preferences.version=1