Merge branch 'master' into 1.3

# Conflicts:
#	README.md

README.md

@@ -1,10 +1,11 @@
 Dwoo
 ====
-[![Latest Stable Version](https://poser.pugx.org/dwoo/dwoo/v/stable)](https://packagist.org/packages/dwoo/dwoo)
-[![Total Downloads](https://poser.pugx.org/dwoo/dwoo/downloads)](https://packagist.org/packages/dwoo/dwoo)
-[![License](https://poser.pugx.org/dwoo/dwoo/license)](https://packagist.org/packages/dwoo/dwoo)
+[![Latest Stable Version](https://poser.pugx.org/dwoo/dwoo/v/stable?format=flat-square)](https://packagist.org/packages/dwoo/dwoo)
+[![Total Downloads](https://poser.pugx.org/dwoo/dwoo/downloads?format=flat-square)](https://packagist.org/packages/dwoo/dwoo)
+[![License](https://poser.pugx.org/dwoo/dwoo/license?format=flat-square)](https://packagist.org/packages/dwoo/dwoo)
 [![Build Status](https://travis-ci.org/dwoo-project/dwoo.svg?branch=master)](https://travis-ci.org/dwoo-project/dwoo)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/dwoo-project/dwoo/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/dwoo-project/dwoo/?branch=master)
+[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/dwoo-project/dwoo/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/dwoo-project/dwoo/?branch=1.2)
+[![Gitter](https://badges.gitter.im/dwoo_project/support.svg)](https://gitter.im/dwoo_project/support?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Dwoo is a PHP5/PHP7 Template Engine that was started in early 2008. The idea came
 from the fact that Smarty, a well known template engine, is getting older and
@@ -42,7 +43,7 @@ Basic Example
 -------------
 ```php
 <?php
-// Include the main class (it should handle the rest on its own)
+// Include Composer autoloader
 require __DIR__ . '/vendor/autoload.php';
 
 // Create the controller, this is reusable
@@ -91,4 +92,4 @@ foreach($articles as $article) {
     // Or use the article directly (which is a lot easier in this case)
     $pageContent .= $dwoo->get($tpl, $article);
 }
-```
+```