Merge commit '0.3.1-RC2' into next

diff --cc pom.xml
Simple merge

diff --cc 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 --cc 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>