Merge branch 'master' into develop

DONATIONS.md

@@ -1,7 +1,41 @@
-We would like to thank everyone that contributed to this library. If you find our library useful and wish to donate as well, you can do so directly [through paypal](https://www.paypal.me/tiviesantos)!! Your contribution will be greatly appreciated.
+We would like to thank everyone that contributed to this library. If you find our library useful and wish to donate as well, you can do so [through patreon](https://www.patreon.com/showdownjs) or directly [through paypal](https://www.paypal.me/tiviesantos)!! Your contribution will be greatly appreciated.
 
+# Sponsors
 
-# Donors
+## Platinum Supporters
+
+## Gold Supporters
+
+## Silver Supporters
+
+
+# Patron Supporters
+
+## Awesome Supporter
+
+## Cool Supporter
+
+## Supporter
+
+ - Ricardo Jordão
+ 
+ - Tiago Silva
+
+
+---
+
+# One Time Donors
+
+- [**Learn on demand Systems**](http://www.learnondemandsystems.com/) (1000$)
+
+- **Nothing AG** (25€)
+
+    > Thank you for developing Showdown :)
+
+- **Sam Huffman** (15$)
+
+    > Thanks for the great work on showdown.js! I've been looking for a good solution to serve wiki-like text to a browser and render as
+    HTML but nearly gave up after mixed success with wikitext. Your library gets me very close to where I want to be.
 
 - **Maya Lekova** (10$)
 
@@ -12,15 +46,12 @@ We would like to thank everyone that contributed to this library. If you find ou
 
 - **Lin Wang** (10$)
 
-- **Juan Marcelo Russo** (1$)
-
 - **Walter Schnell** (10$)
 
-- [**Learn on demand Systems**](http://www.learnondemandsystems.com/) (1000$) 
-
 - **ivanhjc** (5$)
 
-- **Sam Huffman** (15$)
+- **Asbjørn Ulsberg** (5$)
 
-    > Thanks for the great work on showdown.js! I've been looking for a good solution to serve wiki-like text to a browser and render as
-    HTML but nearly gave up after mixed success with wikitext. Your library gets me very close to where I want to be.
+    > Thanks for the ShowdownJS support!
+
+- **Juan Marcelo Russo** (1$)

README.md

@@ -17,27 +17,26 @@ Showdown can be used client side (in the browser) or server side (with NodeJs).
 
 Check a live Demo here http://demo.showdownjs.com/
 
-
-## Who uses Showdown (or a fork)
-
- - [GoogleCloudPlatform](https://github.com/GoogleCloudPlatform)
- - [Ghost](https://ghost.org/)
- - [Meteor](https://www.meteor.com/)
- - [Stackexchange](http://stackexchange.com/) - forked as [PageDown](https://code.google.com/p/pagedown/)
- - [docular](https://github.com/Vertafore/docular)
- - [and some others...](https://www.npmjs.com/browse/depended/showdown)
-
-## Donate [![Donate](https://img.shields.io/badge/Donate-PayPal-green.svg)](https://www.paypal.me/tiviesantos)
+## [![Patreon](https://c5.patreon.com/external/logo/become_a_patron_button.png)](https://www.patreon.com/bePatron?u=11141581)
 
 As you know, ShowdownJS is a free library and it will remain free forever. However, maintaining and improving the library costs time and money.
 
-If you like our work and find our library useful, please donate ~~[through Pledgie](https://pledgie.com/campaigns/35166) or~~ directly [through paypal](https://www.paypal.me/tiviesantos)!! Your contribution will be greatly appreciated and help us continue to develop this awesome library.
+If you like our work and find our library useful, please donate through [patreon](https://www.patreon.com/showdownjs) or directly through [paypal](https://www.paypal.me/tiviesantos)!! Your contribution will be greatly appreciated and help me continue to develop this awesome library.
 
 ## License
 
 ShowdownJS v 2.0 is release under the MIT version.
 Previous versions are release under GPL 2.0
 
+## Who uses Showdown (or a fork)
+
+ - [GoogleCloudPlatform](https://github.com/GoogleCloudPlatform)
+ - [Meteor](https://www.meteor.com/)
+ - [Stackexchange](http://stackexchange.com/) - forked as [PageDown](https://code.google.com/p/pagedown/)
+ - [docular](https://github.com/Vertafore/docular)
+ - [md-page](https://github.com/oscarmorrison/md-page)
+ - [and some others...](https://www.npmjs.com/browse/depended/showdown)
+
 ## Installation
 
 ### Download tarball
@@ -296,7 +295,7 @@ var defaultOptions = showdown.getDefaultOptions();
 
  * **ghCodeBlocks**: (boolean) [default true] Enable support for GFM code block style.
 
- * **tasklists**:(boolean) [default false] Enable support for GFM tasklists. Example:
+ * **tasklists**: (boolean) [default false] Enable support for GFM tasklists. Example:
  
    ```md
     - [x] This task is done