rm Zimbra (reason: open core), update 'Mail server' note
Update index.html
rm Zimbra logo
Update de.json
merge changes
Merge branch 'Casimo-patch-2'
fix de.json add missing end
remove note about Bitmessage in de.json
Revert "rm Bitmessage (reason: secupost.net IP vulnerability #465)"

This reverts commit bdc11204e8ccb193348f75064bb7eb8ccf564365.
Revert "remove note about Bitmessage in de.json"

This reverts commit 1ed3c74d5ed0bfec163901d28e8b40095a05ef59.
Update de.json

pdated Online transactions, Digital distribution and VPN
Merge pull request #570 from Casimo/patch-1

Update de.json
Update de.json

upwards from i18n-dukgoxmpp-desc to i18n-dns-provider
left links to English guides as they were, with description
Update de.json - fixed some typos
fix conflict and rm Zarafa and Zimbra descriptions
fix de.json conflict
Update fr.json
Update index.html with JonDo live-CD, class 'i18n-jondolive-desc'

Requested in https://github.com/nylira/prism-break/issues/574
Couldn't upload the logo file through GitHub's web interface, so URL is referenced instead.
Update index.html
Update en.json with i18n-jondolive-desc

companion commit to https://github.com/Cathryne/prism-break/commit/f9936c18e677e9f53b91f51a64470ab9cee978e8