reindent, fix whitespace, more headers/subsections, update toc and contributors list

README.md

@@ -9,66 +9,75 @@ This is a list of [Free](https://en.wikipedia.org/wiki/Free_software) Software [
 Table of Contents
 =================
 
-<!-- MarkdownTOC depth=3 -->
+  - [Analytics](#analytics)
-
+  - [Automation](#automation)
-- [Analytics](#analytics)
+  - [Blogging Platforms](#blogging-platforms)
-- [Automation](#automation)
+  - [Bookmarks & Link Sharing](#bookmarks--link-sharing)
-- [Blogging Platforms](#blogging-platforms)
+  - [Calendar and Address Books](#calendar-and-address-books)
-- [Bookmarks & Link Sharing](#bookmarks--link-sharing)
+  - [Communication systems](#communication-systems)
-- [Calendar and Address Books](#calendar-and-address-books)
-- [Communication systems](#communication-systems)
     - [Email](#email)
+      - [Webmail clients](#webmail-clients)
+      - [Mail Transfer Agents](#mail-transfer-agents)
+      - [Mail Delivery Agents](#mail-delivery-agents)
+      - [Complete solutions](#complete-solutions)
     - [XMPP](#xmpp)
+      - [XMPP Servers](#xmpp-servers)
+      - [XMPP Web Clients](#xmpp-web-clients)
     - [SIP](#sip)
     - [IRC](#irc)
     - [Custom](#custom)
     - [Social Networks and Forums](#social-networks-and-forums)
-- [Content Management Systems (CMS)](#content-management-systems-cms)
+  - [Content Management Systems (CMS)](#content-management-systems-cms)
     - [E-commerce](#e-commerce)
-- [Federated Identity/Authentication](#federated-identityauthentication)
+  - [Federated Identity/Authentication](#federated-identityauthentication)
-- [Feed Readers](#feed-readers)
+  - [Feed Readers](#feed-readers)
-- [File Sharing and Synchronization](#file-sharing-and-synchronization)
+  - [File Sharing and Synchronization](#file-sharing-and-synchronization)
-- [Games](#games)
+      - [Web based file managers](#web-based-file-managers)
-- [Gateways](#gateways)
+      - [File synchronization](#file-synchronization)
-- [Groupware](#groupware)
+      - [Single-click/drag-n-drop upload](#single-clickdrag-n-drop-upload)
-- [Learning and Courses](#learning-and-courses)
+      - [Peer-to-peer filesharing](#peer-to-peer-filesharing)
-- [Maps & GPS](#maps--gps)
+      - [Distributed filesystems](#distributed-filesystems)
-- [Video Streaming](#video-streaming)
+  - [Games](#games)
-- [Mind Maps](#mind-maps)
+  - [Gateways](#gateways)
-- [Money, Budgeting and Management](#money-budgeting-and-management)
+  - [Groupware](#groupware)
-- [Monitoring and Administration](#monitoring-and-administration)
+  - [Learning and Courses](#learning-and-courses)
-- [Music Streaming](#music-streaming)
+  - [Maps & GPS](#maps--gps)
-- [Note-taking & Editors](#note-taking--editors)
+  - [Video Streaming](#video-streaming)
-- [Office Suites](#office-suites)
+  - [Mind Maps](#mind-maps)
-- [Password Managers](#password-managers)
+  - [Money, Budgeting and Management](#money-budgeting-and-management)
-- [Pastebins](#pastebins)
+  - [Monitoring and Administration](#monitoring-and-administration)
-- [Personal Dashboards](#personal-dashboards)
+  - [Music Streaming](#music-streaming)
-- [Photo and Video Galleries](#photo-and-video-galleries)
+  - [Note-taking & Editors](#note-taking--editors)
-- [Polls and Events](#polls-and-events)
+  - [Office Suites](#office-suites)
-- [Proxy](#proxy)
+  - [Password Managers](#password-managers)
-- [Read it Later Lists](#read-it-later-lists)
+  - [Pastebins](#pastebins)
-- [Search Engines](#search-engines)
+  - [Personal Dashboards](#personal-dashboards)
-- [Software Development](#software-development)
+  - [Photo and Video Galleries](#photo-and-video-galleries)
+  - [Polls and Events](#polls-and-events)
+  - [Proxy](#proxy)
+  - [Read it Later Lists](#read-it-later-lists)
+  - [Search Engines](#search-engines)
+  - [Software Development](#software-development)
     - [Project Management](#project-management)
     - [Bug Trackers](#bug-trackers)
     - [IDE/Tools](#idetools)
     - [Continuous Integration](#continuous-integration)
     - [Documentation Generators](#documentation-generators)
-- [Static site generators](#static-site-generators)
+  - [Static site generators](#static-site-generators)
-- [Task management/To-do lists](#task-managementto-do-lists)
+  - [Task management/To-do lists](#task-managementto-do-lists)
-- [Ticketing](#ticketing)
+  - [Ticketing](#ticketing)
-- [URL Shorteners](#url-shorteners)
+  - [URL Shorteners](#url-shorteners)
-- [VPN](#vpn)
+  - [VPN](#vpn)
-- [Web servers](#web-servers)
+  - [Web servers](#web-servers)
-- [Wikis](#wikis)
+  - [Wikis](#wikis)
-- [Self-hosting Solutions](#self-hosting-solutions)
+  - [Self-hosting Solutions](#self-hosting-solutions)
-- [List of Licenses](#list-of-licenses)
+  - [List of Licenses](#list-of-licenses)
-- [External links](#external-links)
+  - [External links](#external-links)
-- [Contributing](#contributing)
+  - [Contributing](#contributing)
-- [License](#license)
+  - [License](#license)
 
-<!-- /MarkdownTOC -->
 
+-----------------------------------------------------------------------------
 
 ## Analytics
 
@@ -110,7 +119,6 @@ See also [Static Site Generators](#static-site-generators), [Content Management
   * [Wordpress](https://wordpress.org/) - Create a beautiful website or blog. ([Source code](https://github.com/WordPress/WordPress)) `GPLv2`
 
 
-
 ## Bookmarks & Link Sharing
 
   * [Bookie](https://github.com/bookieio/Bookie) - Python based delicious.com replacement ([Firefox addon](https://github.com/bookieio/bookie-firefox), [Demo](http://bmark.us/), [Documentation](http://docs.bmark.us/)
@@ -124,7 +132,6 @@ See also [Static Site Generators](#static-site-generators), [Content Management
   * [unmark](https://github.com/plainmade/unmark) - An open source to do app for links
 
 
-
 ## Calendar and Address Books
 
 Some [Groupware](#groupware) solutions also feature calendar/address book editing and synchronization.
@@ -142,8 +149,7 @@ Some [Groupware](#groupware) solutions also feature calendar/address book editin
 
 ### Email
 
-
+#### Webmail clients
-*Webmail clients*
 
   * [Cypht](http://cypht.org/index.html) - A feed reader for your email accounts - `GPL`
   * [Dovecot](http://www.dovecot.org/) - IMAP and POP3 email server, written with security primarily in mind ([Source code](http://hg.dovecot.org/)) `MIT/LGPLv2` `C`
@@ -153,7 +159,10 @@ Some [Groupware](#groupware) solutions also feature calendar/address book editin
   * [SquirrelMail](http://squirrelmail.org) - Another browser-based IMAP client.
   * [WebMail Lite](http://www.afterlogic.org/webmail-lite) - Webbased IMAP Mail client ([Source Code](https://github.com/afterlogic/webmail-lite) `GPLv3` `PHP`
 
-*MTA - Mail Transfer Agents (SMTP servers).*
+
+#### Mail Transfer Agents
+
+_MTAs / SMTP servers_
 
 * [Courier MTA](http://www.courier-mta.org/) - Fast, scalable, enterprise mail/groupware server providing ESMTP, IMAP, POP3, webmail, mailing list, basic web-based calendaring and scheduling services. ([Source Code](http://www.courier-mta.org/repo.html) `GPLv3` `C`
 * [Exim](http://www.exim.org/) - Message transfer agent (MTA) developed at the University of Cambridge.
@@ -165,13 +174,18 @@ Some [Groupware](#groupware) solutions also feature calendar/address book editin
 * [Qmail](http://cr.yp.to/qmail.html) - Secure Sendmail replacement.
 * [Sendmail](http://www.sendmail.com/sm/open_source/) - Message transfer agent (MTA).
 
-*MDA - Mail Delivery Agents (IMAP/POP3 software).*
+
+#### Mail Delivery Agents
+
+_MDAs - IMAP/POP3 software_
 
 * [Cyrus IMAP/POP3](http://cyrusimap.org/) - Intended to be run on sealed servers, where normal users are not permitted to log in.
 * [Dovecot](http://www.dovecot.org/) - IMAP and POP3 server written primarily with security in mind.
 
 
-*Complete solutions - simple deployment of a mail server, e.g. for inexperienced or impatient admins.*
+#### Complete solutions
+
+_simple deployment of a mail server, e.g. for inexperienced or impatient admins._
 
   * [hMailServer](https://www.hmailserver.com) - Open source e-mail server for Microsoft Windows
   * [Mailcow](https://github.com/andryyy/mailcow) - Mail server suite based on Dovecot, Postfix and other open source software, that provides a modern Web UI for administration. `PHP/Shell/Other` `GPLv2`
@@ -181,25 +195,29 @@ Some [Groupware](#groupware) solutions also feature calendar/address book editin
   * [Modoboa](http://modoboa.org/en/) - Modoboa is a mail hosting and management platform including a modern and simplified Web User Interface. `Python` `MIT`
   * [Fufix](https://www.debinux.de/fufix/) - Fufix is a mailserver installer based on Dovecot, Postfix, Postfixadmin, Nginx, PHP, MySQL and Fail2ban.
 
+
 ### XMPP
 
-*[XMPP](https://en.wikipedia.org/wiki/XMPP) servers.*
+_[Extensible Messaging and Presence Protocol](https://en.wikipedia.org/wiki/XMPP) software_
 
-* [ejabberd](http://www.ejabberd.im/) - XMPP instant messaging server. `GPL` `Erlang`
-* [Metronome IM](http://www.lightwitch.org/metronome) - Fork of Prosody IM. `MIT` `Lua`
-* [MongooseIM](https://www.erlang-solutions.com/products/mongooseim-massively-scalable-ejabberd-platform) - Fork of ejabberd.
-* [Openfire](http://www.igniterealtime.org/projects/openfire/) - Real time collaboration (RTC) server. `Apache` `Java`
-* [Prosody IM](http://prosody.im/) - Feature-rich and easy to configure XMPP server. `MIT` `Lua`
-* [Tigase](https://projects.tigase.org/projects/tigase-server) - XMPP server implementation in Java.
 
-*XMPP Web Clients*
+#### XMPP Servers
 
-* [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript.
+  * [ejabberd](http://www.ejabberd.im/) - XMPP instant messaging server. `GPL` `Erlang`
-* [Converse.js](https://conversejs.org/) - A free and open-source XMPP chat client in your browser ([Source](https://github.com/jcbrand/converse.js)) `MPLv2` `Javascript`
+  * [Metronome IM](http://www.lightwitch.org/metronome) - Fork of Prosody IM. `MIT` `Lua`
-* [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives. ([Source code](https://github.com/digicoop/kaiwa))
+  * [MongooseIM](https://www.erlang-solutions.com/products/mongooseim-massively-scalable-ejabberd-platform) - Fork of ejabberd.
-* [Kontalk](http://kontalk.org/) – Kontalk is an Open Source Messenger, similiar to WhatsApp (app for android only currently), including end-to-end encryption, server is based on Tigase XMPP Server - ([Source code](https://github.com/kontalk)) `GPLv3`
+  * [Openfire](http://www.igniterealtime.org/projects/openfire/) - Real time collaboration (RTC) server. `Apache` `Java`
-* [Lets-Chat](http://sdelements.github.io/lets-chat/) - A self hosted chat suite written in Node.
+  * [Prosody IM](http://prosody.im/) - Feature-rich and easy to configure XMPP server. `MIT` `Lua`
-* [Salut à Toi](http://www.salut-a-toi.org/) - Multipurpose, multi frontend, libre and decentralised communication tool. ([Source code](http://repos.goffi.org/sat)) `AGPLv3` `Python`
+  * [Tigase](https://projects.tigase.org/projects/tigase-server) - XMPP server implementation in Java.
+
+#### XMPP Web Clients
+
+  * [Candy](http://candy-chat.github.io/candy/) - Multi user XMPP client written in Javascript.
+  * [Converse.js](https://conversejs.org/) - A free and open-source XMPP chat client in your browser ([Source](https://github.com/jcbrand/converse.js)) `MPLv2` `Javascript`
+  * [Kaiwa](http://getkaiwa.com/) - Web based chat client in the style of common paid alternatives. ([Source code](https://github.com/digicoop/kaiwa))
+  * [Kontalk](http://kontalk.org/) – Kontalk is an Open Source Messenger, similiar to WhatsApp (app for android only currently), including end-to-end encryption, server is based on Tigase XMPP Server - ([Source code](https://github.com/kontalk)) `GPLv3`
+  * [Lets-Chat](http://sdelements.github.io/lets-chat/) - A self hosted chat suite written in Node.
+  * [Salut à Toi](http://www.salut-a-toi.org/) - Multipurpose, multi frontend, libre and decentralised communication tool. ([Source code](http://repos.goffi.org/sat)) `AGPLv3` `Python`
     * [Libervia](http://wiki.goffi.org/wiki/Libervia/en) - Web frontend from Salut à Toi ([Source code](http://repos.goffi.org/libervia)) `AGPLv3` `Python`
 
 
@@ -212,6 +230,7 @@ Some [Groupware](#groupware) solutions also feature calendar/address book editin
   * [Kamailio](http://www.kamailio.org/w/) - Modular SIP server (registrar/proxy/router/etc) `GPLv2` `C`
   * [Ostel](https://dev.guardianproject.info/projects/ostel/wiki/Server_Documentation) - Secure SIP telephony setup with ZRTP encryption `GPLv3` `Ruby`
 
+
 ### IRC
 
 *[IRC](https://en.wikipedia.org/wiki/Internet_Relay_Chat) communication software*
@@ -222,7 +241,9 @@ Some [Groupware](#groupware) solutions also feature calendar/address book editin
   * [Weechat](https://weechat.org/) - a fast, light and extensible chat client `GPLv3` `C`
   * [ZNC](http://wiki.znc.in/ZNC) - An advanced IRC bouncer `Apache` `C++`
 
+
 ### Custom
+
   * [Freenet](https://freenetproject.org/index.html) - anonymously share files, browse and publish "freesites" (web sites accessible only through Freenet) and chat on forums ([Source code](https://github.com/freenet/fred)) `GPLv2` `Java`
   * [GNUNet](https://gnunet.org/) - Free software framework for decentralized, peer-to-peer networking `GPLv3` `C/Java`
   * [Jitsi Meet](https://jitsi.org/Projects/JitsiMeet) - Jitsi Meet is an OpenSource (MIT) WebRTC JavaScript application that uses Jitsi Videobridge to provide high quality, scalable video conferences. `MIT ` `JavaScript`
@@ -240,6 +261,7 @@ Some [Groupware](#groupware) solutions also feature calendar/address book editin
   * [TextBelt](https://github.com/typpo/textbelt) - An outgoing SMS API that uses carrier-specific gateways to deliver your text messages for free, and without ads. ` ⚠ ` `MIT` `JavaScript`
   * [Tox](https://tox.chat/) -  A distributed, secure messenger with audio and video chat capabilities. `GPLv3` `C`
 
+
 ### Social Networks and Forums
 
   * [Anahita](https://www.getanahita.com/) Open Source Social Networking Framework & Platform. ([Source code](https://github.com/anahitasocial) `GPLv3` `PHP`
@@ -304,6 +326,7 @@ _Recipe management_
 
   * [OpenEats](http://www.openeats.org/) - a recipe management site that allows users to create, store, share and rate recipes, create grocery lists, and more. ([Source code](https://github.com/qgriffith/OpenEats) `Python/Django` `BSD`
 
+
 ### E-commerce
 
 * [OpenCart](https://www.opencart.com) - Free open source shopping cart solution. ([Source code](https://github.com/opencart/opencart)) `GPLv3` `PHP`
@@ -357,14 +380,15 @@ _Recipe management_
 
 Some [Groupware](#groupware) solutions also feature file sharing and synchronization.
 
-_Web based file managers_
+
+#### Web based file managers
 
   * [Apaxy](http://adamwhitcroft.com/apaxy/) - Theme built to enhance the experience of browsing web directories, using the mod_autoindex Apache module and some CSS to override the default style of a directory listing. ([Source code](https://github.com/AdamWhitcroft/Apaxy) `Public domain` `CSS`
   * [eXtplorer](http://extplorer.sourceforge.net/) - A PHP- and JavaScript- based File Manager
   * [h5ai](https://larsjung.de/h5ai/) - modern file indexer for HTTP web servers with focus on your files. Directories are displayed in a appealing way and browsing them is enhanced by different views, a breadcrumb and a tree overview. ([Source code](https://github.com/lrsjng/h5ai), [Demo](https://larsjung.de/h5ai/demo/)) `MIT` `PHP/Javascript`
 
 
-_File synchronization_
+#### File synchronization
 
   * [Git Annex](http://git-annex.branchable.com/assistant/quickstart/) - File synchronization between computers, servers, external drives
   * [Seafile](http://www.seafile.com/en/home/) - File hosting and sharing solution primary for teams and organizations. ([Demo](https://seacloud.cc/demo)) `GPLv2`
@@ -376,7 +400,7 @@ _File synchronization_
   * [Pydio](https://pyd.io/) - Turn any web server into a powerful file management system and an alternative to mainstream cloud storage providers.
 
 
-_Single-click/drag-n-drop upload_
+#### Single-click/drag-n-drop upload
 
   * [BoZoN](https://github.com/broncowdd/BoZoN) - Minimalist Drag & drop file sharing app `AGPLv3` `PHP`
   * [Coquelicot](https://coquelicot.potager.org/) - Coquelicot is a “one-click” file sharing web application with a focus on protecting users’ privacy. - `AGPLv3`
@@ -394,7 +418,7 @@ _Single-click/drag-n-drop upload_
   * [YouTransfer](http://www.youtransfer.io) - YouTransfer is a simple but elegant self-hosted file transfer & sharing solution. ([Demo](http://demo.youtransfer.io/), [Source code](https://github.com/remie/YouTransfer)) `Apache` `Nodejs`
 
 
-_Peer-to-peer filesharing_
+#### Peer-to-peer filesharing
 
   * [FilePizza](http://file.pizza/) - Peer-to-peer file transfers in your browser ([Source code](https://github.com/kern/filepizza)) `BSD` `Nodejs`
   * [FileTea](https://filetea.me/) - Anonymous, volatile file sharing: does not store any file on server. Bridges a download to the recipient’s browser with an upload from the source’s browser. ([Source code](https://github.com/elima/FileTea) `AGPLv3` `C`
@@ -403,7 +427,8 @@ _Peer-to-peer filesharing_
   * [ShareFest](https://github.com/peer5/sharefest) -  Web based p2p file sharing built on WebRTC Data Channels API ([Demo](https://www.sharefest.me/)) `Apache 2.0` `Nodejs`
 
 
-_Distributed filesystems_
+#### Distributed filesystems
+
   * [Camlistore](https://camlistore.org/) - Camlistore is a set of open source formats, protocols, and software for modeling, storing, searching, sharing and synchronizing data in the post-PC era. Data may be files or objects, tweets or 5TB videos, and you can access it via a phone, browser or FUSE filesystem. ([Source code](https://github.com/camlistore/camlistore)) `Apache` `Go`
   * [Go IPFS](https://github.com/ipfs/go-ipfs) - Implementation of [IPFS](http://ipfs.io/), a global, versioned, peer-to-peer filesystem that seeks to connect all computing devices with the same system of files. It combines good ideas from Git, BitTorrent, Kademlia, SFS, and the Web. It is like a single bittorrent swarm, exchanging git objects.
   * [Ori Filesystem](http://ori.scs.stanford.edu/) - A Secure Distributed File System built for offline operation ([Source code](https://bitbucket.org/orifs/ori/wiki/Home)) `MIT` `C++`
@@ -417,6 +442,7 @@ _Distributed filesystems_
   * [Agar.IO Clone](https://github.com/huytd/agar.io-clone) - Agar.io clone written with Socket.IO and HTML5 canvas - `MIT`
   * [Cubiks-2048](https://github.com/Kshitij-Banerjee/Cubiks-2048) - Clone of 2048 game in 3D. - `CCANC 4.0`
 
+
 ## Gateways
 
   * [GateOne](https://github.com/liftoff/GateOne/) - Gate One is an HTML5 web-based terminal emulator and SSH client. - `AGPLv3`
@@ -435,6 +461,7 @@ _Distributed filesystems_
   * [Tine 2.0org](https://www.tine20.org) - Contacts, Calendar, Tasks, WebDAV, ActiveSync, VOIP, Mail-Client, CRM, Sales, Projects, Timetracker -  ([Demo](https://demo.tine20.net)) `AGPLv3`
   * [Zimbra Collaboration](https://www.zimbra.com/downloads/) - Email, calendar, collaboration server with web interface and lots of integrations.  ([Source code]( https://www.zimbra.com/open-source)) `GPLv2/CPALv1` `Java`
 
+
 ## Learning and Courses
 
   * [Chamilo LMS](https://chamilo.org/chamilo-lms/) - Chamilo LMS allows you to create a virtual campus for the provision of online or semi-online training. ([Source code](https://github.com/chamilo/chamilo-lms)) `GPLv3` `PHP`
@@ -443,6 +470,7 @@ _Distributed filesystems_
   * [Moodle](https://moodle.org/) - Moodle is a learning and courses platform with one of the largest open source communities worldwide. ([Demo](https://moodle.org/demo/), [Source code](https://git.moodle.org/gw)) `GPL` `PHP`
   * [Sakai](https://www.sakaiproject.org/) - The Sakai project provides a flexible and feature-rich environment for teaching, learning, research and other collaboration. ([Demo](https://www.sakaiproject.org/try-sakai), [Source code](https://github.com/sakaiproject/sakai)) `ECLv2` `Java`
 
+
 ## Maps & GPS
 
   * [Graphhopper](https://graphhopper.com/) -  Fast routing library and server using OpenStreetMap ([Source code](https://github.com/graphhopper/graphhopper))
@@ -461,6 +489,7 @@ _Distributed filesystems_
   * [Streama](https://github.com/dularion/streama) - Self-hosted Netflix alternative. - `MIT` `Java`
   * [Zoneminder](https://github.com/ZoneMinder/ZoneMinder) - Closed-circuit television (CCTV) software application which supports IP, USB and Analog cameras `GPLv2` `PHP`
 
+
 ## Mind Maps
 
  * [Mindmaps](https://github.com/drichard/mindmaps) - An open source, offline capable, mind mapping application ([Demo](http://drichard.org/mindmaps/))
@@ -468,7 +497,6 @@ _Distributed filesystems_
 
 ## Money, Budgeting and Management
 
-
   * [Galette](http://galette.eu/dc/) - Galette is a membership management web application towards non profit organizations ([Source code](http://git.tuxfamily.org/galette/galette.git/)) `GPLv3` `PHP`
   * [GLPI](http://www.glpi-project.org/spip.php?lang=en) - GLPI is an IT assests/resources/inventory manager ([Source code](https://forge.glpi-project.org/projects/glpi)) `GPLv2` `PHP`
   * [GRR](http://grr.devome.com/?lang=en) - Assets management and booking for small/medium companies ([demo](http://grr.devome.com/demo/week_all.php?year=2015&month=07&day=28&area=94), _administrateur/azerty_) `GPLv2` `PHP`
@@ -482,7 +510,6 @@ _Distributed filesystems_
 
 ## Monitoring and Administration
 
-
   * [Prometheus](http://prometheus.io/) - Monitoring system and time series database. ([Source code](https://github.com/prometheus/prometheus)) `Apache` `Go`
   * [psdash](https://github.com/Jahaja/psdash) - A linux system information web dashboard using psutils and flask
   * [pyDash](https://github.com/k3oni/pydash) - Small web-based monitoring dashboard for linux ([Demo](http://pydash.hostechs.com/main/) - _admin/admin_)
@@ -503,8 +530,6 @@ _Distributed filesystems_
   * [Subsonic](http://subsonic.org/) - Open-source web-based media streamer and jukebox ([Demo](http://demo.subsonic.org/login.view?user=guest4&password=guest), [Source code](https://github.com/EugeneKay/subsonic)) `GPLv3` `Java`
 
 
-
-
 ## Note-taking & Editors
 
   * [dillinger](http://dillinger.io/) - The last Markdown editor, ever. ([Source code](https://github.com/joemccann/dillinger/)) `MIT` `Nodejs`
@@ -527,11 +552,13 @@ _Distributed filesystems_
   * [WebODF](http://webodf.org/) - Tools and libraries to view and edit Open Document Format (ODF) files. ([Source code](https://github.com/kogmbh/WebODF)) `AGPLv3` `Javascript`
   * [ownCloud documents](https://doc.owncloud.org/server/8.2/user_manual/documents.html) - collaborative editing and sharing of rich-text documents ([Source code](https://github.com/owncloud/documents)) `AGPLv3` `PHP`
 
+
 ## Password Managers
 
  * [RatticDB](http://rattic.org/) - Password Management for Humans ([Source code](https://github.com/tildaslash/RatticWeb), [Demo](https://demo.rattic.org/cred/list/))
  * [Teampass](http://www.teampass.net/) - Password manager dedicated for managing passwords in a collaborative way on any server Apache, MySQL and PHP. ([Source code](https://github.com/nilsteampassnet/TeamPass/)) `GPLv3` `PHP`
 
+
 ## Pastebins
 
   * [0bin](https://github.com/sametmax/0bin) -  Client side encrypted pastebin `WTFPL` `Python`
@@ -545,12 +572,14 @@ _Distributed filesystems_
   * [Stikked](https://github.com/claudehohl/Stikked) - An advanced and beautiful pastebin written in `PHP` `GPLv3`
   * [tastebin](https://github.com/andreineculau/tastebin) - Updated version of hastebin plus additional features `Apache` `Nodejs`
 
+
 ## Personal Dashboards
 
   * [Habitica](http://habitica.com/) - A habit tracker app which treats your goals like a Role Playing Game. Previously called HabitRPG. ([Source code](https://github.com/HabitRPG/habitrpg)) `GPLv3/Other` `Nodejs`
   * [wger](https://github.com/rolandgeider/wger) - A web-based personal workout, fitness and weight logger/tracker. It can also be used as a simple gym management utility and offers a full REST API as well. ([Demo](https://wger.de)) `AGPLv3` `Python`
   * [Reportr](http://www.reportr.io/) - Your life's personal dashboard. ([Source code](https://github.com/Reportr/dashboard))
 
+
 ## Photo and Video Galleries
 
   * [CumulusClips](http://cumulusclips.org/) - your own video sharing website with CumulusClips video sharing script. You can build a YouTube clone where users can upload, rate, comment on videos, and much more.  `GPLv2` `PHP` ([Demo](https://tube.devosi.org/))
@@ -573,6 +602,7 @@ _Distributed filesystems_
   * [Videobin](http://videobin.org/code) - A simple video upload and sharing service with transcoding ([Demo](http://videobin.org/), [Source code](https://r-w-x.org/videobin.git)) `GPLv3` `Python`
   * [Zenphoto](http://www.zenphoto.org/) - open-source gallery and CMS project ([Source code](https://github.com/zenphoto/zenphoto))  `GPLv2` `PHP`
 
+
 ## Polls and Events
 
   * [dudle](http://primelife.ercim.eu/results/opensource/63-dudle) - an online scheduling application ([demo](https://dudle.inf.tu-dresden.de/)) `AGPLv3` `Ruby`
@@ -582,6 +612,7 @@ _Distributed filesystems_
   * [Nuages](https://nuages.domainepublic.net/) -  collaborative meeting poll system, similar to doodle or rdvz ([Source code](http://git.domainepublic.net/?p=nuages.git;a=tree)) `GPLv3` `Python/Django`
   * [OpenSondage](https://github.com/leblanc-simon/OpenSondage) - an online service for planning an appointment or make a decision quickly and easily: Make a poll, Define dates or subjects to choose, Send the poll link to your friends or colleagues, Discuss and make a decision - ([Demo](http://framadate.org/), [Example](https://framadate.org/aqg259dth55iuhwm))
 
+
 ## Proxy
 
   * [scotty](http://www.scotty-transporter.org/) - Scotty is a free opensource proxy software for bypassing filter and censorship systems. - ([Source Code](https://github.com/SSilence/scotty)) `GPLv3` `Java`
@@ -591,11 +622,13 @@ _Distributed filesystems_
   * [Swiperproxy](https://swiperproxy.github.io/) - A lightning-fast, open source web proxy that is easy for you to run and customize. ([Source code](https://github.com/swiperproxy/swiperproxy), [Demo](http://proxy.donttrustrobots.nl/)) `MIT`
   * [Tinyproxy](https://banu.com/tinyproxy/) - light-weight HTTP/HTTPS proxy daemon ([Source code](https://git.banu.com/tinyproxy/)) `GPLv2` `C`
 
+
 ## Read it Later Lists
 
   * [Readityourself](https://github.com/memiks/readityourself) - read the web without ads, comments, or tweets ([Demo](http://www.readityourself.net/)) `MIT` `PHP`
   * [Wallabag](http://www.wallabag.org/?lang=fr_fr) - Wallabag, formerly Poche, is a web application allowing you to save articles to read them later with improved readability. ([Demo](http://demo.wallabag.org/), [Public instance](http://www.framabag.org/), [Source code](https://github.com/wallabag/wallabag) `MIT` `PHP`
 
+
 ## Search Engines
 
   * [Searx](https://github.com/asciimoo/searx) - A privacy-respecting, hackable metasearch engine ([Demo](https://searx.me/), [Public instances](https://github.com/asciimoo/searx/wiki/Searx-instances))
@@ -626,6 +659,7 @@ See also [Ticketing](#ticketing), [Task management/To-do lists](#task-management
   * [Trac](http://trac.edgewall.org/) - Written in python.
   * [Phproject](http://www.phproject.org/) - A high performance full-featured project management system ([Source code](https://github.com/Alanaktion/phproject), [Demo](http://demo.phproject.org/)) `GPLv3`
 
+
 ### Bug Trackers
 
 *Manage issues regarding your software development. See also [Ticketing](#ticketing) and [Task management/To-do lists](#task-managementto-do-lists)*
@@ -648,6 +682,7 @@ See also [Ticketing](#ticketing), [Task management/To-do lists](#task-management
   * [Regexr](http://regexr.com/) -  RegExr is a HTML/JS based tool for creating, testing, and learning about Regular Expressions. ([Source code](https://github.com/gskinner/regexr/)) `MIT` `Nodejs`
   * [RStudio Server](https://www.rstudio.com/products/rstudio/#Server) - web browser based IDE for R. ([Source code](https://github.com/rstudio/rstudio/)) `AGPLv3` `Java/C++`
 
+
 ### Continuous Integration
 
   * [Jenkins](https://jenkins-ci.org/) - Continuous Integration Server ([Source Code](https://github.com/jenkinsci/jenkins/)) `MIT` `Java`
@@ -713,7 +748,6 @@ See https://github.com/n1trux/awesome-sysadmin#vpn
 See https://github.com/n1trux/awesome-sysadmin#web
 
 
-
 ## Wikis
 
 See also [Documentation Generators](#documentation-generators), [Wikimatrix](http://www.wikimatrix.org/), [Wiki Engines on WikiIndex](http://wikiindex.org/Category:Wiki_Engine), [List of wiki software on wikipedia](https://en.wikipedia.org/wiki/List_of_wiki_software), [Comparison of wiki software on wikipedia](https://en.wikipedia.org/wiki/Comparison_of_wiki_software).
@@ -737,6 +771,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
   * [WiKiss](http://wikiss.tuxfamily.org/) - a Wiki, simple to use and install `PHP`
   * [Wikitten](https://github.com/victorstanciu/Wikitten) - Wikitten is a small, fast, PHP wiki, and the perfect place to store your notes, code snippets, ideas, and so on. `PHP`
 
+
 ------------------------------------
 
 ## Self-hosting Solutions
@@ -751,8 +786,6 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 
 -------------------------------------------------------
 
-
-
 ## List of Licenses
 
  * ` ⚠ ` - Depends on a third party network service
@@ -770,6 +803,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
 
 
 -------------------------------------------------------
+
 ## External links
 
  * [Awesome Sysadmin](https://github.com/n1trux/awesome-sysadmin) -  A curated list of amazingly awesome open source sysadmin resources.
@@ -790,6 +824,7 @@ See also [Documentation Generators](#documentation-generators), [Wikimatrix](htt
  * Sections should be ordered alphabetically, lines inside sections should be ordered alphabetically.
  * The list of contributors can be updated with `git shortlog -sne`
 
+
 ## License
 
 This list is under the [Creative Commons Attribution-ShareAlike 3.0 Unported](LICENSE) License.
@@ -797,7 +832,7 @@ This list is under the [Creative Commons Attribution-ShareAlike 3.0 Unported](LI
 
 The list of contributors can be found below
 
-	159	nodiscc <nodiscc@gmail.com>
+    180	nodiscc <nodiscc@gmail.com>
     121	Edward D <ed.kickball@hotmail.com>
     22	Kickball <ed.kickball@hotmail.com>
     13	jungle-boogie <sean@jungleboogie.me>
@@ -815,6 +850,7 @@ The list of contributors can be found below
     4	Dr. Azrael Tod <github.com@g33ky.de>
     4	Ilya Sevostyanov <d3th@zeen.ru>
     4	Jean Elchinger <jinformatique@riseup.net>
+    4	Joshua Westerheide <dev@jdoubleu.de>
     3	Ethan Lowman <ethanal@users.noreply.github.com>
     3	Jan Vlnas <jnv@users.noreply.github.com>
     3	Leo Gaggl <leo@brightcookie.com.au>
@@ -883,10 +919,12 @@ The list of contributors can be found below
     1	Marcin Karpezo <m.karpezo@nencki.gov.pl>
     1	Marcus Ramberg <marcus@nordaaker.com>
     1	MatFluor <MatFluor@users.noreply.github.com>
+    1	Matt Hazinski <matt@matthazinski.com>
     1	Mike Steele <mike@steel.fm>
     1	Morris Jobke <hey@morrisjobke.de>
     1	Murdoc Bates <trockenasche@gmail.com>
     1	Oliver Kopp <kopp.dev@gmail.com>
+    1	Phill <phill@formbet.co.uk>
     1	Remy Adriaanse <remy@adriaanse.it>
     1	Remy Honig <remyhonig@users.noreply.github.com>
     1	Riddler <Iamjithin@live.com>
@@ -899,7 +937,9 @@ The list of contributors can be found below
     1	cbdev <cb@cbcdn.com>
     1	dimqua <dimqua@lavabit.com>
     1	florianl <florianl@users.noreply.github.com>
+    1	lachlan-00 <lachlan.00@gmail.com>
     1	littleguga <littleguga@users.noreply.github.com>
+    1	memorex258 <phillip.a.brown@live.com>
     1	mertinop <martin.santibanez.a@gmail.com>
     1	sc0repi0 <sc0repi0@gmx.de>
     1	skarphet <skarphet@users.noreply.github.com>
@@ -908,3 +948,4 @@ The list of contributors can be found below
     1	ttoups <ich@timotoups.de>
 
 
+