Merge remote-tracking branch 'upstream/master' into fix/issue-110-update-mapbox-style-spec

Conflicts:
	package.json

config/webpack.config.js

@@ -16,7 +16,7 @@ module.exports = {
   ],
   devtool: process.env.WEBPACK_DEVTOOL || 'cheap-module-source-map',
   output: {
-    path: path.join(__dirname, 'public'),
+    path: path.join(__dirname, '..', 'public'),
     filename: 'bundle.js'
   },
   resolve: {
@@ -49,6 +49,6 @@ module.exports = {
     new HtmlWebpackPlugin({
       title: 'Maputnik',
       template: './src/template.html'
-    }),
+    })
   ]
 };

config/webpack.production.config.js

@@ -30,7 +30,7 @@ module.exports = {
     ]
   },
   output: {
-    path: path.join(__dirname, 'public'),
+    path: path.join(__dirname, '..', 'public'),
     filename: '[name].[chunkhash].js',
     chunkFilename: '[chunkhash].js'
   },