Merge branch 'develop' of github.com:grafana/grafana into dashboard_snapshot_poc

Conflicts:
	src/app/features/dashboard/partials/shareDashboard.html

pkg/models/stats.go

@@ -0,0 +1,11 @@
+package models
+
+type SystemStats struct {
+	DashboardCount int
+	UserCount      int
+	OrgCount       int
+}
+
+type GetSystemStatsQuery struct {
+	Result *SystemStats
+}