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

pkg/services/sqlstore/dashboard_snapshot.go

@@ -86,9 +86,10 @@ func GetDashboardSnapshot(query *m.GetDashboardSnapshotQuery) error {
 }
 
 func SearchDashboardSnapshots(query *m.GetDashboardSnapshotsQuery) error {
-	var snapshots = make(m.DashboardSnapshots, 0)
+	var snapshots = make(m.DashboardSnapshotsList, 0)
 
 	sess := x.Limit(query.Limit)
+	sess.Table("dashboard_snapshot")
 
 	if query.Name != "" {
 		sess.Where("name LIKE ?", query.Name)

pkg/services/sqlstore/user.go

@@ -96,6 +96,7 @@ func CreateUser(cmd *m.CreateUserCommand) error {
 			EmailVerified: cmd.EmailVerified,
 			Created:       time.Now(),
 			Updated:       time.Now(),
+			LastSeenAt:    time.Now().AddDate(-10, 0, 0),
 		}
 
 		if len(cmd.Password) > 0 {