Merge branch 'next' into image-management

diff --combined src/main/resources/templates/insert/sone.xml
index a2c6c09,7d3c8aa..1f12d90
--- 1/src/main/resources/templates/insert/sone.xml
--- 2/src/main/resources/templates/insert/sone.xml
+++ b/src/main/resources/templates/insert/sone.xml
@@@ -2,6 -2,7 +2,7 @@@
  <sone>
  
        <time><% currentSone.time></time>
+       <protocol-version>0</protocol-version>
  
        <client>
                <name>Sone</name>
@@@ -51,10 -52,4 +52,10 @@@
                <%/foreach>
        </reply-likes>
  
 +      <albums>
 +              <%foreach currentSone.albums album>
 +              <%include insert/include/album.xml>
 +              <%/foreach>
 +      </albums>
 +
  </sone>