Merge develop into master

Author: Nicolas Carlo

bower.json

@@ -1,11 +1,6 @@
 {
   "name": "gitgraph.js",
-  "version": "1.11.4",
-  "main": [
-    "./build/gitgraph.js",
-    "./build/gitgraph.css"
-  ],
-  "ignore": [
-    "**/.*"
-  ]
+  "version": "1.12.0",
+  "main": ["./build/gitgraph.js", "./build/gitgraph.css"],
+  "ignore": ["**/.*"]
 }