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

src/app/components/kbn.js

@@ -509,7 +509,8 @@ function($, _, moment) {
         submenu: [
           {text: 'bits', value: 'bits'},
           {text: 'bytes', value: 'bytes'},
-          {text: 'kilobytes', value: 'kbytes'},
+          {text: 'kilo bytes', value: 'kbytes'},
+          {text: 'mega bytes', value: 'mbytes'},
         ]
       },
       {