Merge commit '0.3.1-RC3' into next

diff --combined pom.xml
index 003b20d,421e0bb..38c02b2
--- 1/pom.xml
--- 2/pom.xml
+++ b/pom.xml
@@@ -2,12 -2,12 +2,12 @@@
        <modelVersion>4.0.0</modelVersion>
        <groupId>net.pterodactylus</groupId>
        <artifactId>sone</artifactId>
-       <version>0.3.1-RC2</version>
+       <version>0.3.1-RC3</version>
        <dependencies>
                <dependency>
                        <groupId>net.pterodactylus</groupId>
                        <artifactId>utils</artifactId>
 -                      <version>0.7</version>
 +                      <version>0.7.1</version>
                </dependency>
                <dependency>
                        <groupId>junit</groupId>
@@@ -30,15 -30,9 +30,15 @@@
                <dependency>
                        <groupId>net.pterodactylus</groupId>
                        <artifactId>utils.json</artifactId>
 -                      <version>0.1-SNAPSHOT</version>
 +                      <version>0.1</version>
                </dependency>
        </dependencies>
 +      <repositories>
 +              <repository>
 +                      <id>pterodactylus</id>
 +                      <url>http://maven.pterodactylus.net/</url>
 +              </repository>
 +      </repositories>
        <properties>
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
        </properties>
@@@ -92,19 -86,4 +92,19 @@@
                        </plugin>
                </plugins>
        </build>
 +      <reporting>
 +              <plugins>
 +                      <plugin>
 +                              <groupId>org.apache.maven.plugins</groupId>
 +                              <artifactId>maven-javadoc-plugin</artifactId>
 +                              <configuration>
 +                                      <links>
 +                                              <link>http://download.oracle.com/javase/6/docs/api/</link>
 +                                              <link>http://java.pterodactylus.net/utils/apidocs/</link>
 +                                              <link>http://java.pterodactylus.net/utils.json/apidocs/</link>
 +                                      </links>
 +                              </configuration>
 +                      </plugin>
 +              </plugins>
 +      </reporting>
  </project>