Add GPGMail
Fixed incorrect translation of "free"

Fixed the incorrect translation of the term "free" to refer to freedom rather than price.
Merge pull request #260 from Zopieux/master

More French translations (and few typos fixed)
Merge pull request #261 from GPGTools/master

Adding GPGMail which is an alternative to Enigmail for Mail.app on OS X
Merge pull request #264 from alid/patch-1

Fixed incorrect translation of "free"
clarify differences in mail encryption
modified index.html to add open web analytics, added image resources, edited en.json
Merge pull request #268 from rodrigopimentel/analytics

modified index.html to add open web analytics, added image resources, ed...
Update nl.json
Merge pull request #270 from lazlolazlolazlo/patch-6

Update nl.json
added articles
Added PC-BSD as the most popular desktop BSD system right now
Revert "Added PC-BSD as the most popular desktop BSD system right now"

This reverts commit bd89ef0978403533dc0af7b041e6e0cd68547ff6.
added OpenBSD and MidnightBSD as "non-PRISM" BSDs.

According to our previous discussion.
Uhm. Oops :)

Now.
Merge pull request #273 from dertuxmalwieder/master

Added two "non-PRISM" BSDs.
hide midnight bsd for now
added asterisk, ejabberd, freeswitch, kamailio, openfire, prosody, tigase (xmpp and sip software)
add xmppp/sip section text to en.json
added xmpp/sip to the sidebar