Merge branch 'master' of github.com:grafana/grafana

Conflicts:
	examples/nginx-app/package.json
	examples/nginx-app/plugin.json

tests/test-app/dashboards/connections.json

@@ -0,0 +1,5 @@
+{
+  "title": "Nginx Connections",
+  "revision": "1.5",
+  "schemaVersion": 11
+}

tests/test-app/dashboards/memory.json

@@ -0,0 +1,5 @@
+{
+  "title": "Nginx Memory",
+  "revision": "2.0",
+  "schemaVersion": 11
+}