Merge master into dev prep

nginx/nginx.conf

@@ -15,11 +15,6 @@ server {
         proxy_set_header Upgrade $http_upgrade;
     }
 
-    location /grafana {
-        proxy_pass         http://grafana:3000;
-        proxy_set_header   Host $host;
-    }
-
     location @proxy_to_app {
         proxy_pass http://web:8000;