Merge branch 'master' into feature/will/ci-lettuce-tests

Resolved conflict with changes to Rakefile in master

Conflicts:
	rakefile

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -646,7 +646,7 @@ class ContentStoreTest(ModuleStoreTestCase):
         resp = self.client.get(reverse('index'))
         self.assertContains(
             resp,
-            '<h1 class="title-1">My Courses</h1>',
+            '<h1 class="page-header">My Courses</h1>',
             status_code=200,
             html=True
         )

cms/djangoapps/contentstore/tests/test_i18n.py

@@ -48,7 +48,7 @@ class InternationalizationTest(ModuleStoreTestCase):
 
         resp = self.client.get(reverse('index'))
         self.assertContains(resp,
-                            '<h1 class="title-1">My Courses</h1>',
+                            '<h1 class="page-header">My Courses</h1>',
                             status_code=200,
                             html=True)
 
@@ -63,7 +63,7 @@ class InternationalizationTest(ModuleStoreTestCase):
                                )
 
         self.assertContains(resp,
-                            '<h1 class="title-1">My Courses</h1>',
+                            '<h1 class="page-header">My Courses</h1>',
                             status_code=200,
                             html=True)
 

cms/static/sass/_variables.scss

@@ -184,6 +184,6 @@ $lightBluishGrey2: rgb(213, 220, 228);
 $error-red: rgb(253, 87, 87);
 
 // type
-$sans-serif: $f-serif;
+$sans-serif: $f-sans-serif;
 $body-line-height: golden-ratio(.875em, 1);