Merge "Fix Maven Javadoc generation problem"

pom.xml

@@ -194,7 +194,7 @@
 	<plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-javadoc-plugin</artifactId>
-	  <version>2.6.1</version>
+	  <version>2.7</version>
         </plugin>
 
         <plugin>