Update grafana to 1.5.2 and fixes nginx integration

This PR replaces #7