Merge remote-tracking branch 'github/master' into open115b

Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js

platform/features/conductor/src/ConductorRepresenter.js

@@ -28,13 +28,8 @@ define(
 
         var CONDUCTOR_HEIGHT = "100px",
             TEMPLATE = [
-                '<div style=',
-                '"position: absolute; bottom: 0; width: 100%; ',
-                'overflow: hidden; ',
-                'height: ' + CONDUCTOR_HEIGHT + '">',
-                "<mct-include key=\"'time-conductor'\" ng-model='ngModel'>",
-                "</mct-include>",
-                '</div>'
+                "<mct-include key=\"'time-conductor'\" ng-model='conductor'>",
+                "</mct-include>"
             ].join(''),
             THROTTLE_MS = 200,
             GLOBAL_SHOWING = false;
@@ -166,8 +161,7 @@ define(
                 this.conductorElement =
                     this.$compile(TEMPLATE)(this.conductorScope());
                 this.element.after(this.conductorElement[0]);
-                this.element.addClass('abs');
-                this.element.css('bottom', CONDUCTOR_HEIGHT);
+                this.element.addClass('l-controls-visible l-time-controller-visible');
                 GLOBAL_SHOWING = true;
             }
         };

platform/features/layout/res/templates/layout.html

@@ -19,7 +19,7 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div style="width: 100%; height: 100%;"
+<div class="l-layout"
      ng-controller="LayoutController as controller">
 
     <div class='frame child-frame panel abs'

platform/features/pages/res/iframe.html

@@ -19,7 +19,7 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="abs l-iframe">
+<div class="l-iframe abs">
 <iframe ng-controller="EmbeddedPageController as ctl"
         ng-src="{{ctl.trust(model.url)}}">
 </iframe>