Merge branch 'develop'

# Conflicts:
#	pom.xml
#	weixin-java-common/pom.xml
#	weixin-java-cp/pom.xml
#	weixin-java-mp/pom.xml

pom.xml

@@ -5,11 +5,11 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.github.binarywang</groupId>
   <artifactId>weixin-java-parent</artifactId>
-  <version>1.3.4</version>
+  <version>1.3.5</version>
   <packaging>pom</packaging>
   <name>WeiXin Java Tools - Parent</name>
   <description>微信公众号、企业号上级POM</description>
-  <url>https://github.com/chanjarster/weixin-java-tools</url>
+  <url>https://github.com/binarywang/weixin-java-tools</url>
 
   <licenses>
     <license>
@@ -23,18 +23,23 @@
       <name>Daniel Qian</name>
       <email>chanjarster@gmail.com</email>
     </developer>
+    <developer>
+      <name>Binary Wang</name>
+      <email>binarywang@gmail.com</email>
+    </developer>
   </developers>
 
   <scm>
-    <connection>scm:git:https://github.com/chanjarster/weixin-java-tools.git</connection>
-    <developerConnection>scm:git:git@github.com:chanjarster/weixin-java-tools.git</developerConnection>
-    <url>https://github.com/chanjarster/weixin-java-tools</url>
+    <connection>scm:git:https://github.com/binarywang/weixin-java-tools.git</connection>
+    <developerConnection>scm:git:git@github.com:binarywang/weixin-java-tools.git</developerConnection>
+    <url>https://github.com/binarywang/weixin-java-tools</url>
   </scm>
 
   <modules>
     <module>weixin-java-common</module>
     <module>weixin-java-cp</module>
     <module>weixin-java-mp</module>
+    <module>spring-demo</module>
   </modules>
 
   <properties>
@@ -144,6 +149,16 @@
   </distributionManagement>
 
   <profiles>
+	  <profile>
+	    <id>doclint-java8-disable</id>
+	    <activation>
+	      <jdk>[1.8,)</jdk>
+	    </activation>
+	    <properties>
+	      <javadoc.opts>-Xdoclint:none</javadoc.opts>
+	    </properties>
+	  </profile>
+	  
     <profile>
       <id>release</id>
       <build>
@@ -174,6 +189,7 @@
               </execution>
             </executions>
             <configuration>
+              <additionalparam>${javadoc.opts}</additionalparam>
               <charset>UTF-8</charset>
               <locale>zh_CN</locale>
             </configuration>