Merged stylesheet changes

Author: akhenry

main.js

@@ -104,9 +104,9 @@ define([
     './platform/entanglement/bundle',
     './platform/search/bundle',
     './platform/status/bundle',
-    './platform/commonUI/regions/bundle',
-    './example/msl/bundle',
-    './example/localTimeSystem/bundle'
+    './platform/commonUI/regions/bundle'
+    //'./examples/localTimeSystem/bundle'
+    //'./example/msl/bundle'
 ], function (Main, legacyRegistry) {
     return {
         legacyRegistry: legacyRegistry,

platform/features/conductor-v2/conductor/res/sass/time-conductor-espresso.scss

@@ -20,13 +20,13 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 @import "bourbon";
-@import "../../../../commonUI/general/res/sass/constants";
-@import "../../../../commonUI/general/res/sass/mixins";
-@import "../../../../commonUI/general/res/sass/mobile/constants";
-@import "../../../../commonUI/general/res/sass/mobile/mixins";
-@import "../../../../commonUI/themes/espresso/res/sass/constants";
-@import "../../../../commonUI/themes/espresso/res/sass/mixins";
-@import "../../../../commonUI/general/res/sass/icons";
+@import "../../../../../commonUI/general/res/sass/constants";
+@import "../../../../../commonUI/general/res/sass/mixins";
+@import "../../../../../commonUI/general/res/sass/mobile/constants";
+@import "../../../../../commonUI/general/res/sass/mobile/mixins";
+@import "../../../../../commonUI/themes/espresso/res/sass/constants";
+@import "../../../../../commonUI/themes/espresso/res/sass/mixins";
+@import "../../../../../commonUI/general/res/sass/icons";
 @import "constants";
 
 // Thematic constants

platform/features/conductor-v2/conductor/res/sass/time-conductor-snow.scss

@@ -20,13 +20,13 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 @import "bourbon";
-@import "../../../../commonUI/general/res/sass/constants";
-@import "../../../../commonUI/general/res/sass/mixins";
-@import "../../../../commonUI/general/res/sass/mobile/constants";
-@import "../../../../commonUI/general/res/sass/mobile/mixins";
-@import "../../../../commonUI/themes/snow/res/sass/constants";
-@import "../../../../commonUI/themes/snow/res/sass/mixins";
-@import "../../../../commonUI/general/res/sass/icons";
+@import "../../../../../commonUI/general/res/sass/constants";
+@import "../../../../../commonUI/general/res/sass/mixins";
+@import "../../../../../commonUI/general/res/sass/mobile/constants";
+@import "../../../../../commonUI/general/res/sass/mobile/mixins";
+@import "../../../../../commonUI/themes/snow/res/sass/constants";
+@import "../../../../../commonUI/themes/snow/res/sass/mixins";
+@import "../../../../../commonUI/general/res/sass/icons";
 @import "constants";
 
 // Thematic constants