Merge branch 'patch-1' of https://github.com/sairam0903/grafana into sairam0903-patch-1

pkg/models/org_user.go

@@ -35,6 +35,10 @@ func (r RoleType) Includes(other RoleType) bool {
 	if r == ROLE_EDITOR {
 	if r == ROLE_EDITOR {
 		return other != ROLE_ADMIN
 		return other != ROLE_ADMIN
 	}
 	}
+	
+	if r == ROLE_VIEWER {
+		return other == ROLE_VIEWER
+	}
 
 
 	return false
 	return false
 }
 }