Merge branch 'master' into websocket

pkg/models/alert.go

@@ -73,7 +73,6 @@ type Alert struct {
 	Frequency      int64
 
 	EvalData     *simplejson.Json
-	EvalDate     time.Time
 	NewStateDate time.Time
 	StateChanges int
 

pkg/models/notifications.go

@@ -23,6 +23,7 @@ type SendWebhookSync struct {
 	Password   string
 	Body       string
 	HttpMethod string
+	HttpHeader map[string]string
 }
 
 type SendResetPasswordEmailCommand struct {