Merge branch 'master' into next

diff --cc pom.xml
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/core/Core.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/core/FreenetInterface.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/core/SoneDownloader.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/core/SoneInserter.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/core/UpdateChecker.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/data/Sone.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/freenet/wot/DefaultIdentity.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/freenet/wot/WebOfTrustConnector.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/main/SonePlugin.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/template/SoneAccessor.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/text/SoneTextParser.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/web/CreateSonePage.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/web/SearchPage.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/web/WebInterface.java
Simple merge

diff --cc src/main/java/net/pterodactylus/sone/web/page/FreenetTemplatePage.java
Simple merge