Merge branch 'feature/tileserver' of https://github.com/geometalab/osm2vectortiles into feature/tileserver

Conflicts:
	tileserver/Dockerfile

tileserver/.dockerignore

@@ -0,0 +1 @@
+vector-tiles-sample

tileserver/config.json

@@ -0,0 +1,11 @@
+{
+  "/": {
+    "source": "tmstyle:///data/countries.tm2"
+  },
+  "/vector": {
+    "source": "mbtiles:///data/countries.mbtiles"
+  },
+  "/raster": {
+    "source": "tmstyle:///data/countries.tm2"
+  }
+}