Merge remote-tracking branch 'upstream/master'

src/app/panels/bettermap/module.css

@@ -0,0 +1,4 @@
+/** custom additions **/
+.leaflet-marker-icon {
+  color: #333;
+}

src/app/panels/bettermap/module.js

@@ -15,6 +15,7 @@ define([
   './leaflet/leaflet-src',
   'require',
 
+  'css!./module.css',
   'css!./leaflet/leaflet.css',
   'css!./leaflet/plugins.css'
 ],