Merge commit '0.3.1-RC2' into next

diff --combined pom.xml
index 33b8984,9b2d5ce..003b20d
--- 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-RC1</version>
+       <version>0.3.1-RC2</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>

diff --combined src/main/resources/templates/include/viewPost.html
index 5b4525d,e351fd0..5335227
--- 1/src/main/resources/templates/include/viewPost.html
--- 2/src/main/resources/templates/include/viewPost.html
+++ b/src/main/resources/templates/include/viewPost.html
@@@ -7,9 -7,9 +7,9 @@@
        <div class="inner-part">
                <div>
                        <div class="author profile-link"><a href="viewSone.html?sone=<% post.sone.id|html>"><% post.sone.niceName|html></a></div>
 -                      <div class="text"><% post.text|html></div>
 +                      <div class="text"><% post.text></div>
                </div>
-               <div class="status-line">
+               <div class="post-status-line status-line">
                        <div class="time"><a href="viewPost.html?post=<% post.id|html>"><% post.time|date format="MMM d, yyyy, HH:mm:ss"></a></div>
                        <div class="likes<%if post.likes.size|match value=0> hidden<%/if>"><span title="<% post.likes.soneNames|html>">⬆<span class="like-count"><% post.likes.size></span></span></div>
                        <%ifnull ! currentSone>

diff --combined src/main/resources/templates/include/viewReply.html
index 8862cf2,d77625b..d11aa5f
--- 1/src/main/resources/templates/include/viewReply.html
--- 2/src/main/resources/templates/include/viewReply.html
+++ b/src/main/resources/templates/include/viewReply.html
@@@ -7,9 -7,9 +7,9 @@@
        <div class="inner-part">
                <div>
                        <div class="author profile-link"><a href="viewSone.html?sone=<% reply.sone.id|html>"><% reply.sone.niceName|html></a></div>
 -                      <div class="text"><% reply.text|html></div>
 +                      <div class="text"><% reply.text></div>
                </div>
-               <div class="status-line">
+               <div class="reply-status-line status-line">
                        <div class="time"><% reply.time|date format="MMM d, yyyy, HH:mm:ss"></div>
                        <div class="likes<%if reply.likes.size|match value=0> hidden<%/if>"><span title="<% reply.likes.soneNames|html>">⬆<span class="like-count"><% reply.likes.size></span></span></div>
                        <%ifnull ! currentSone>