Merge branch 'open-master' into open1170b

Conflicts:
	platform/commonUI/general/res/sass/plots.scss
	platform/commonUI/inspect/src/InfoConstants.js
	platform/features/imagery/src/policies/ImageryViewPolicy.js
	platform/features/static-markup/res/markup.html

platform/features/plot/bundle.json

@@ -8,6 +8,7 @@
                 "glyph": "6",
                 "templateUrl": "templates/plot.html",
                 "needs": [ "telemetry" ],
+                "priority": "preferred",
                 "delegation": true
             }
         ],

platform/features/plot/res/templates/plot.html

@@ -108,7 +108,7 @@
                         <span class="ui-symbol icon">I</span>
                     </a>
 
-                    <div class="menu-element btn icon-btn very-subtle btn-menu dropdown click-invoke"
+                    <div class="menu-element btn s-very-subtle btn-menu dropdown menus-to-left"
                          ng-if="plot.getModeOptions().length > 1"
                          ng-controller="ClickAwayController as toggle">
 
@@ -116,7 +116,7 @@
 
                         <span class="ui-symbol icon type-icon">{{plot.getMode().glyph}}</span>
                         <span>{{plot.getMode().name}}</span>
-                        <span class='ui-symbol icon invoke-menu'>v</span>
+                        <span class='ui-symbol invoke-menu'>v</span>
 
                         <div class="menu dropdown" ng-show="toggle.isActive()">
                             <ul>

platform/features/static-markup/bundle.json

@@ -1,21 +0,0 @@
-{
-    "extensions": {
-        "types": [
-            {
-                "key": "static.markup",
-                "name": "Static Markup",
-                "glyph": "\u0070",
-                "description": "Static markup sandbox",
-                "features": [ "creation" ]
-            }
-        ],
-        "views": [
-            {
-                "templateUrl": "markup.html",
-                "name": "Static Markup",
-                "type": "static.markup",
-                "key": "static.markup"
-            }
-        ]
-    }
-}