øRevert "rm i2p #504"

This reverts commit 6484ab4f90d77301ec0e96179372762b100f2e54.
Merge branch 'master' of github.com:nylira/prism-break
Update fr.json

translation into french of
i18n-bitmessage-desc
i18n-mediacrush-desc
i18n-mediacrush-self-desc
i18n-centos-desc
i18n-smeserver-desc
i18n-yunohost-desc
i18n-server-software
i18n-server-os-title
Update fr.json

Little mistaping: Serveur instead of Server
Merge pull request #509 from juanito003/patch-1

Patch 1
add Cryptocat #501 and move Mailvelope to 'Web browser add-ons' for clarity and add sub-sections to add-ons too
change SIP server software back to SIP server and add Ostel logo #512
add Ostel to 'SIP server' service section #512
add Ostel logo #512 and improve Jitsi description
update CSipSimple and Redphone descriptions, update Video+VoIP notes
Update sr.json

Re-translated the whole site. There was a lot of untranslated strings and there was some grammatical errors on the previously translated strings.
Merge pull request #513 from aleksandar-todorovic/patch-1

Update sr.json