Merge branch 'alerting' of github.com:grafana/grafana into alerting

Conflicts:
	pkg/services/sqlstore/migrations/alert_mig.go

emails/templates/alert_notification.html

@@ -42,7 +42,7 @@
 						Value
 					</td>
 				</tr>
-				[[range .Events]]
+				[[range .EvalMatches]]
 				<tr>
 					<td class="wrapper last">
 						[[.Metric]]

public/emails/alert_notification.html

@@ -157,7 +157,7 @@ color: #FFFFFF !important;
 						Value
 					</td>
 				</tr>
-				{{range .Events}}
+				{{range .EvalMatches}}
 				<tr style="padding: 0; text-align: left; vertical-align: top" align="left">
 					<td class="wrapper last" style="-moz-hyphens: auto; -webkit-font-smoothing: antialiased; -webkit-hyphens: auto; -webkit-text-size-adjust: none; border-collapse: collapse !important; color: #222222; font-family: 'Open Sans', 'Helvetica Neue', 'Helvetica', Helvetica, Arial, sans-serif; font-size: 14px; font-weight: normal; hyphens: auto; line-height: 19px; margin: 0; padding: 0px 0px 10px; position: relative; text-align: left; vertical-align: top; word-break: break-word" align="left" valign="top">
 						{{.Metric}}