studio - sass cleanup: local merge with master and small comment/organization tweaks to variables and base-styles

cms/static/sass/_variables.scss

@@ -15,7 +15,6 @@ $fg-min-width: 900px;
 // type
 $sans-serif: 'Open Sans', $verdana;
 $body-line-height: golden-ratio(.875em, 1);
-$error-red: rgb(253, 87, 87);
 
 // colors - new for re-org
 $black: rgb(0,0,0);
@@ -97,4 +96,5 @@ $brightGreen: rgb(22, 202, 87);
 $disabledGreen: rgb(124, 206, 153);
 $darkGreen: rgb(52, 133, 76);
 $lightBluishGrey: rgb(197, 207, 223);
-$lightBluishGrey2: rgb(213, 220, 228);
+$lightBluishGrey2: rgb(213, 220, 228);
+$error-red: rgb(253, 87, 87);

cms/static/sass/base-style.scss

@@ -46,5 +46,6 @@
 
 @import 'assets/content-types';
 
+// xblock-related
 @import 'module/module-styles.scss';
 @import 'descriptor/module-styles.scss';