Merge branch 'master' into greenkeeper-shower-ribbon-2.0.2

* master:
  chore(package): update shower-material to version 1.0.2

# Conflicts:
#	package.json

package.json

@@ -22,7 +22,7 @@
   ],
   "dependencies": {
     "shower-core": "^2.0.3",
-    "shower-material": "^1.0.1",
+    "shower-material": "^1.0.2",
     "shower-ribbon": "^2.0.2"
   },
   "devDependencies": {