diff --git a/pkg/tsdb/cloudwatch/metric_find_query.go b/pkg/tsdb/cloudwatch/metric_find_query.go
index b9d4d5b6a80..1e1e855b123 100644
--- a/pkg/tsdb/cloudwatch/metric_find_query.go
+++ b/pkg/tsdb/cloudwatch/metric_find_query.go
@@ -127,7 +127,7 @@ func init() {
 		"AWS/Events":           {"RuleName"},
 		"AWS/Firehose":         {"DeliveryStreamName"},
 		"AWS/IoT":              {"Protocol"},
-		"AWS/Kinesis":          {"StreamName", "ShardID"},
+		"AWS/Kinesis":          {"StreamName", "ShardId"},
 		"AWS/KinesisAnalytics": {"Flow", "Id", "Application"},
 		"AWS/Lambda":           {"FunctionName", "Resource", "Version", "Alias"},
 		"AWS/Logs":             {"LogGroupName", "DestinationType", "FilterName"},
diff --git a/public/app/features/dashboard/create_folder_ctrl.ts b/public/app/features/dashboard/create_folder_ctrl.ts
index 8eebfecf1b5..f75fdee926e 100644
--- a/public/app/features/dashboard/create_folder_ctrl.ts
+++ b/public/app/features/dashboard/create_folder_ctrl.ts
@@ -6,6 +6,7 @@ export class CreateFolderCtrl {
   nameExists = false;
   titleTouched = false;
 
+  /** @ngInject **/
   constructor(private backendSrv, private $location, navModelSrv) {
     this.navModel = navModelSrv.getNav('dashboards', 'manage-dashboards', 0);
   }
diff --git a/public/app/features/org/team_details_ctrl.ts b/public/app/features/org/team_details_ctrl.ts
index e4dc91386b5..e96c3512180 100644
--- a/public/app/features/org/team_details_ctrl.ts
+++ b/public/app/features/org/team_details_ctrl.ts
@@ -5,6 +5,7 @@ export default class TeamDetailsCtrl {
   teamMembers: User[] = [];
   navModel: any;
 
+  /** @ngInject **/
   constructor(private $scope, private backendSrv, private $routeParams, navModelSrv) {
     this.navModel = navModelSrv.getNav('cfg', 'teams', 0);
     this.get();
diff --git a/public/img/grafana_mask_icon_white.svg b/public/img/grafana_mask_icon_white.svg
new file mode 100644
index 00000000000..d810d3735c7
--- /dev/null
+++ b/public/img/grafana_mask_icon_white.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <!-- Generator: Sketch 46 (44423) - http://www.bohemiancoding.com/sketch -->
+    <title>grafana_mask_icon</title>
+    <desc>Created with Sketch.</desc>
+    <defs></defs>
+    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="grafana_icon" transform="translate(0.500000, 0.000000)" fill-rule="nonzero" fill="#ffffff">
+            <path d="M14.696431,7.05957497 C14.6699907,6.79076468 14.6259234,6.48229387 14.5377889,6.13856924 C14.4496544,5.79925134 14.3174526,5.42467964 14.1235567,5.03688776 C13.9296607,4.64909587 13.6784773,4.24808381 13.3523796,3.8558852 C13.2245846,3.70164979 13.0835693,3.55182111 12.9337407,3.40639916 C13.1584837,2.51183379 12.6605236,1.73625002 12.6605236,1.73625002 C11.8012121,1.68336931 11.2547781,2.00506031 11.0520687,2.15048226 C11.0168149,2.13726208 10.9859678,2.11963518 10.950714,2.106415 C10.805292,2.04912756 10.6554633,1.99184013 10.4968212,1.94336614 C10.3425858,1.89489216 10.1839437,1.8508249 10.0208948,1.81116436 C9.85784594,1.77150383 9.69479708,1.74065675 9.52734149,1.71421639 C9.49649441,1.70980967 9.47005406,1.70540294 9.43920698,1.70099622 C9.06463527,0.502366758 7.98939414,-2.84217094e-14 7.98939414,-2.84217094e-14 C6.78635796,0.762363589 6.56161493,1.82879127 6.56161493,1.82879127 C6.56161493,1.82879127 6.55720821,1.8508249 6.54839476,1.89048543 C6.48229387,1.90811233 6.41619298,1.93014596 6.35009209,1.94777287 C6.25755084,1.97421322 6.1650096,2.00946703 6.07687508,2.04472084 C5.98433383,2.07997465 5.89619932,2.11522845 5.80365807,2.15488899 C5.62298231,2.23421005 5.44230654,2.32234457 5.26603751,2.41929254 C5.09417519,2.51624051 4.92671961,2.62200194 4.76367075,2.73217009 C4.74163712,2.72335663 4.71960349,2.71454318 4.71960349,2.71454318 C3.05386108,2.07997465 1.57760789,2.84233823 1.57760789,2.84233823 C1.44099938,4.61384207 2.24302351,5.72874373 2.40166564,5.93145312 C2.36200511,6.04162127 2.3267513,6.15178942 2.29149749,6.26195757 C2.16810917,6.66296963 2.07556792,7.07279514 2.01828048,7.50024756 C2.00946703,7.56194172 2.00065358,7.62363589 1.99624685,7.68533005 C0.453892772,8.44769364 0,10.0032679 0,10.0032679 C1.28235725,11.4795211 2.78064407,11.5720623 2.78064407,11.5720623 C2.78064407,11.5720623 2.7850508,11.5676556 2.7850508,11.5676556 C2.97454001,11.9069735 3.19487631,12.2286645 3.44165296,12.5327286 C3.54741439,12.6605236 3.65317581,12.7795052 3.76775068,12.8984868 C3.30063773,14.2381315 3.83385157,15.3486265 3.83385157,15.3486265 C5.26163078,15.4015072 6.20026341,14.7228714 6.39856607,14.568636 C6.5395813,14.61711 6.68500326,14.6611772 6.83042522,14.696431 C7.27109781,14.8110059 7.72058386,14.8771068 8.1700699,14.8947337 C8.28023805,14.8991404 8.39481293,14.9035471 8.50498108,14.8991404 L8.55786179,14.8991404 L8.59311559,14.8991404 L8.66362321,14.8991404 L8.73413082,14.8947337 L8.73413082,14.8991404 C9.40835989,15.8598067 10.5893624,15.9964152 10.5893624,15.9964152 C11.4310471,15.1106633 11.4795211,14.2293181 11.4795211,14.0398289 L11.4795211,14.0398289 C11.4795211,14.0398289 11.4795211,14.0354221 11.4795211,14.0266087 C11.4795211,14.0089818 11.4795211,14.0001683 11.4795211,14.0001683 L11.4795211,14.0001683 C11.4795211,13.9869482 11.4795211,13.973728 11.4795211,13.9605078 C11.6557901,13.8371195 11.8232457,13.7049177 11.9818878,13.5594957 C12.316799,13.2554316 12.6120497,12.9073003 12.8588263,12.5327286 C12.8808599,12.4974748 12.9028936,12.462221 12.9249272,12.4269672 C13.87678,12.4798479 14.5510091,11.8364659 14.5510091,11.8364659 C14.3923669,10.8449526 13.828306,10.3602127 13.7093244,10.2676715 L13.7093244,10.2676715 C13.7093244,10.2676715 13.7049177,10.2632647 13.6961042,10.258858 C13.6872908,10.2544513 13.6872908,10.2500445 13.6872908,10.2500445 C13.6872908,10.2500445 13.6872908,10.2500445 13.6872908,10.2500445 C13.6828841,10.2456378 13.6740706,10.2412311 13.6652572,10.2368244 C13.6696639,10.1751302 13.6740706,10.1178428 13.6784773,10.0561486 C13.6872908,9.95038719 13.6872908,9.84021904 13.6872908,9.73445761 L13.6872908,9.65513655 L13.6872908,9.61547601 L13.6872908,9.59344238 C13.6872908,9.56700203 13.6872908,9.57581548 13.6872908,9.56700203 L13.6828841,9.50090114 L13.6784773,9.41276662 C13.6784773,9.38191954 13.6740706,9.35547918 13.6696639,9.32903883 C13.6652572,9.30259847 13.6652572,9.27175139 13.6608504,9.24531103 L13.652037,9.16158324 L13.6388168,9.07785545 C13.6211899,8.9676873 13.603563,8.86192588 13.5771226,8.75175773 C13.4757679,8.32430531 13.3083124,7.91888652 13.0923828,7.55312827 C12.8720465,7.18737002 12.5988295,6.86567902 12.2859519,6.59246201 C11.9774811,6.31924501 11.6293498,6.09890871 11.2679982,5.93585985 C10.90224,5.77281099 10.5232616,5.66704957 10.1442831,5.61857558 C9.95479391,5.59213523 9.7653047,5.58332177 9.57581548,5.5877285 L9.50530786,5.5877285 L9.48768096,5.5877285 C9.48327424,5.5877285 9.46124061,5.5877285 9.46564733,5.5877285 L9.43480025,5.5877285 L9.36429263,5.59213523 C9.33785228,5.59213523 9.31141192,5.59654195 9.28937829,5.59654195 C9.19243032,5.6053554 9.09548235,5.61857558 9.00294111,5.63620248 C8.62396268,5.7067101 8.26701787,5.8433186 7.95414033,6.03280782 C7.64126279,6.22229704 7.36804578,6.45585351 7.14770948,6.72025707 C6.92737319,6.98466062 6.75551087,7.27991126 6.63652927,7.58397535 C6.51754767,7.88803944 6.45144678,8.20532371 6.43381988,8.5093878 C6.42941315,8.58430214 6.42941315,8.66362321 6.42941315,8.73853755 C6.42941315,8.75616445 6.42941315,8.77819808 6.42941315,8.79582499 L6.43381988,8.85751915 C6.43822661,8.89277296 6.43822661,8.93243349 6.44263333,8.9676873 C6.45585351,9.12192271 6.48670059,9.27175139 6.52636113,9.41276662 C6.61008892,9.69920381 6.7422907,9.95920064 6.90533956,10.1795369 C7.06838842,10.3998732 7.26669108,10.580549 7.4738072,10.725971 C7.68092332,10.8669862 7.90566635,10.9683409 8.12600264,11.0344418 C8.34633894,11.1005427 8.56667524,11.126983 8.77379136,11.126983 C8.80023171,11.126983 8.82667207,11.126983 8.8487057,11.126983 C8.86192588,11.126983 8.87514605,11.126983 8.88836623,11.126983 C8.90158641,11.126983 8.91480659,11.126983 8.92802677,11.1225763 C8.9500604,11.1225763 8.97209403,11.1181696 8.99412766,11.1181696 C8.99853438,11.1181696 9.00734783,11.1181696 9.01175456,11.1137628 L9.03378819,11.1093561 C9.04700837,11.1093561 9.06022854,11.1049494 9.07344872,11.1049494 C9.09988908,11.1005427 9.12192271,11.0961359 9.14836306,11.0917292 C9.17480342,11.0873225 9.19683705,11.0829158 9.21887068,11.0741023 C9.26734466,11.0652888 9.31141192,11.0476619 9.35547918,11.0344418 C9.4436137,11.0035947 9.53174822,10.9683409 9.60666256,10.9286803 C9.68598363,10.8890198 9.75649124,10.8405458 9.82699886,10.7964786 C9.84462576,10.7832584 9.86665939,10.7700382 9.8842863,10.7524113 C9.95479391,10.6951239 9.96801409,10.5893624 9.91072665,10.5188548 C9.86225267,10.4571607 9.77411815,10.4395338 9.70361053,10.4791943 C9.68598363,10.4880078 9.66835672,10.4968212 9.65072982,10.5056347 C9.58903566,10.5364817 9.52734149,10.5629221 9.46124061,10.5849557 C9.39513972,10.6069894 9.3246321,10.6246163 9.25412449,10.6378364 C9.21887068,10.6422432 9.18361687,10.6466499 9.14395634,10.6510566 C9.12632943,10.6510566 9.10870253,10.6554633 9.0866689,10.6554633 C9.069042,10.6554633 9.04700837,10.6554633 9.03378819,10.6554633 C9.01616128,10.6554633 8.99853438,10.6554633 8.98090748,10.6554633 C8.95887385,10.6554633 8.93684022,10.6554633 8.91480659,10.6510566 C8.91480659,10.6510566 8.90158641,10.6510566 8.91039986,10.6510566 L8.90158641,10.6510566 L8.88836623,10.6510566 C8.87955278,10.6510566 8.8663326,10.6510566 8.85751915,10.6466499 C8.83548552,10.6422432 8.81785862,10.6422432 8.79582499,10.6378364 C8.63277613,10.6158028 8.46972727,10.5673288 8.31549186,10.4968212 C8.15684973,10.4263136 8.00702104,10.3293656 7.87041254,10.2059773 C7.73380403,10.082589 7.61482243,9.93716701 7.52228119,9.76971142 C7.42973994,9.60225584 7.36363906,9.41717335 7.33279197,9.2232774 C7.3195718,9.12632943 7.31075834,9.02497474 7.31516507,8.92802677 C7.31516507,8.90158641 7.3195718,8.87514605 7.3195718,8.8487057 C7.3195718,8.85751915 7.3195718,8.84429897 7.3195718,8.84429897 L7.3195718,8.83548552 L7.3195718,8.81345189 C7.3195718,8.80023171 7.32397852,8.78701154 7.32397852,8.77379136 C7.32838525,8.72091065 7.3371987,8.66802994 7.34601215,8.61514922 C7.42092649,8.19210353 7.63244934,7.77787129 7.95854706,7.46499375 C8.04227485,7.38567268 8.13040937,7.31516507 8.22295061,7.24906418 C8.31549186,7.18296329 8.41684656,7.12567585 8.52260798,7.07720187 C8.6283694,7.02872788 8.73413082,6.98906735 8.8487057,6.95822027 C8.95887385,6.92737319 9.07344872,6.90974628 9.19243032,6.89652611 C9.24971776,6.89211938 9.3070052,6.88771265 9.36869936,6.88771265 C9.38632626,6.88771265 9.39513972,6.88771265 9.40835989,6.88771265 L9.45683388,6.88771265 L9.48768096,6.88771265 C9.50090114,6.88771265 9.48768096,6.88771265 9.49208769,6.88771265 L9.50530786,6.88771265 L9.55378185,6.89211938 C9.6815769,6.90093283 9.80496523,6.91855973 9.92835356,6.94940682 C10.1751302,7.00228753 10.4175001,7.09482877 10.6422432,7.2182171 C11.0917292,7.46940048 11.4751144,7.85719236 11.7086708,8.32430531 C11.8276524,8.55786179 11.9113802,8.80904517 11.9510408,9.069042 C11.9598542,9.13514289 11.9686677,9.20124377 11.9730744,9.26734466 L11.9774811,9.31581865 L11.9818878,9.36429263 C11.9818878,9.38191954 11.9818878,9.39954644 11.9818878,9.41276662 C11.9818878,9.43039352 11.9818878,9.44802043 11.9818878,9.46124061 L11.9818878,9.50530786 L11.9818878,9.55378185 C11.9818878,9.58462893 11.9774811,9.63750964 11.9774811,9.66835672 C11.9730744,9.73886434 11.9642609,9.81377868 11.9554475,9.8842863 C11.946634,9.95479391 11.9334139,10.0253015 11.9201937,10.0958091 C11.9069735,10.1663168 11.8893466,10.2368244 11.8717197,10.3029253 C11.8364659,10.4395338 11.7923986,10.5761423 11.7395179,10.7127508 C11.6337565,10.9771543 11.4927413,11.2327444 11.3252857,11.4663009 C10.9859678,11.9334139 10.5232616,12.3123923 9.99445444,12.5547622 C9.73005089,12.6737438 9.45242715,12.7618783 9.16598997,12.8059456 C9.02497474,12.832386 8.87955278,12.8456061 8.73413082,12.8500129 L8.70769047,12.8500129 L8.68565684,12.8500129 L8.63718285,12.8500129 L8.56667524,12.8500129 L8.53142143,12.8500129 C8.54904833,12.8500129 8.5270147,12.8500129 8.5270147,12.8500129 L8.51379453,12.8500129 C8.43447346,12.8500129 8.35955912,12.8456061 8.28023805,12.8367927 C7.97176724,12.8147591 7.66770315,12.7574716 7.36804578,12.6737438 C7.07279514,12.590016 6.78635796,12.4710344 6.51314095,12.3300192 C5.97111366,12.0391753 5.48196708,11.6425699 5.10298865,11.1622368 C4.91349943,10.9242736 4.74604384,10.6642768 4.60943534,10.3954665 C4.47282683,10.1266562 4.36265869,9.84021904 4.28333762,9.55378185 C4.20401655,9.26293794 4.15554257,8.9676873 4.13350894,8.66802994 L4.12910221,8.6107425 L4.12910221,8.59752232 L4.12910221,8.58430214 L4.12910221,8.55786179 L4.12910221,8.5093878 L4.12910221,8.49616762 L4.12910221,8.47854072 L4.12910221,8.44328691 L4.12910221,8.3727793 L4.12910221,8.35955912 C4.12910221,8.35955912 4.12910221,8.36396584 4.12910221,8.35515239 L4.12910221,8.32871204 C4.12910221,8.29345823 4.12910221,8.2537977 4.12910221,8.21854389 C4.13350894,8.07312193 4.14672911,7.91888652 4.16435602,7.76905784 C4.18198292,7.61922916 4.20842328,7.46499375 4.23927036,7.31516507 C4.27011744,7.16533639 4.30537125,7.01550771 4.34943851,6.86567902 C4.4331663,6.57042839 4.53892772,6.2839912 4.66231605,6.01518092 C4.91349943,5.47756035 5.23959715,4.99722722 5.63179576,4.61384207 C5.72874373,4.51689409 5.83009843,4.42875958 5.93585985,4.34062506 C6.04162127,4.25689726 6.15178942,4.1775762 6.26636429,4.10266186 C6.37653244,4.02774751 6.49551404,3.96164663 6.61449564,3.89995246 C6.67178308,3.86910538 6.73347725,3.8382583 6.79517141,3.81181794 C6.82601849,3.79859777 6.85686557,3.78537759 6.88771265,3.77215741 C6.91855973,3.75893723 6.94940682,3.74571705 6.9802539,3.73249688 C7.10364222,3.67961616 7.23143728,3.63554891 7.36363906,3.59588837 C7.39448614,3.58707492 7.42973994,3.57826147 7.46058703,3.56504129 C7.49143411,3.55622784 7.52668792,3.54741439 7.557535,3.53860093 C7.62363589,3.52097403 7.68973678,3.50334713 7.75583766,3.49012695 C7.78668475,3.4813135 7.82193855,3.47690677 7.85719236,3.46809332 C7.89244617,3.45927987 7.92329325,3.45487314 7.95854706,3.44605969 C7.99380087,3.44165296 8.02464795,3.43283951 8.05990175,3.42843279 L8.10837574,3.41961933 L8.16125645,3.41080588 C8.19651026,3.40639916 8.22735734,3.40199243 8.26261115,3.3975857 C8.30227168,3.39317898 8.33752549,3.38877225 8.37718602,3.38436553 C8.4080331,3.3799588 8.46091382,3.37555207 8.4917609,3.37114535 C8.51379453,3.36673862 8.54023488,3.36673862 8.56226851,3.3623319 L8.6107425,3.35792517 L8.63277613,3.35351844 L8.65921648,3.35351844 C8.69887702,3.34911172 8.73413082,3.34911172 8.77379136,3.34470499 L8.8310788,3.34029827 C8.8310788,3.34029827 8.85311242,3.34029827 8.83548552,3.34029827 L8.8487057,3.34029827 L8.87514605,3.34029827 C8.90599314,3.34029827 8.94124694,3.33589154 8.97209403,3.33589154 C9.09988908,3.33148481 9.23209086,3.33148481 9.35988591,3.33589154 C9.61547601,3.34470499 9.86665939,3.37555207 10.1090293,3.41961933 C10.5981759,3.51216058 11.0564754,3.66639599 11.4751144,3.87351211 C11.8937533,4.0762215 12.2639183,4.32740488 12.590016,4.60062189 C12.6120497,4.61824879 12.6296766,4.63587569 12.6517102,4.6535026 C12.6693371,4.6711295 12.6913707,4.68875641 12.7089976,4.70638331 C12.7486582,4.74163712 12.783912,4.77689093 12.8235725,4.81214473 C12.863233,4.84739854 12.8984868,4.88265235 12.9337407,4.91790616 C12.9689945,4.95315996 13.0042483,4.98841377 13.0395021,5.0280743 C13.1761106,5.17349626 13.3039056,5.31891822 13.4184805,5.4687469 C13.6476303,5.76399754 13.8327127,6.0636549 13.9781347,6.34568536 C13.9869482,6.36331227 13.9957616,6.38093917 14.0045751,6.39856607 C14.0133885,6.41619298 14.022202,6.43381988 14.0310154,6.45144678 C14.0486423,6.48670059 14.0662692,6.5219544 14.0794894,6.55720821 C14.0971163,6.59246201 14.1103365,6.6233091 14.1279634,6.6585629 C14.1411836,6.69381671 14.1588105,6.72466379 14.1720306,6.7599176 C14.2249114,6.89211938 14.2777921,7.01991443 14.3174526,7.13889603 C14.3835535,7.33279197 14.4320275,7.50465429 14.471688,7.65448297 C14.4849082,7.71617713 14.5421956,7.75583766 14.6038898,7.74702421 C14.6699907,7.74261749 14.7184647,7.68973678 14.7184647,7.62363589 C14.7228714,7.46499375 14.7184647,7.27550454 14.696431,7.05957497 Z" id="Shape"></path>
+        </g>
+    </g>
+</svg>
\ No newline at end of file