Merge branch 'master' into feature/diana/rubric-input

lms/static/coffee/src/main.coffee

@@ -39,3 +39,11 @@ $ ->
     $('#signup-modal input[name="email"]').focus()
     _gaq.push(['_trackPageview', '/signup'])
     false
+
+  # fix for ie
+  if !Array::indexOf
+  	Array::indexOf = (obj, start = 0) ->
+  		for ele, i in this[start..]
+            if ele is obj
+                return i + start
+        return -1

lms/static/sass/bourbon/css3/_box-sizing.scss

@@ -2,6 +2,5 @@
 //  content-box | border-box | inherit
   -webkit-box-sizing: $box;
      -moz-box-sizing: $box;
-          box-sizing: $box;
           box-sizing: $box; *behavior: url(/static/scripts/boxsizing.htc);
 }

lms/static/scripts/boxsizing.htc

@@ -85,7 +85,10 @@ function update(){
   }
   resizetimeout = window.setTimeout(function(){
     restore();
+    try {
         init();
+    }
+    catch (err) {}
     resizetimeout = null;
   },100);
 }

lms/templates/static_templates/press_releases/Spring_2013_course_announcements.html

@@ -38,7 +38,7 @@
 
       <p>“I'm delighted to have my Justice course on edX,” said Michael Sandel, Ann T. and Robert M. Bass Professor of Government at Harvard University, “where students everywhere will be able to engage in a global dialogue about the big moral and civic questions of our time.”</p>
 
-      <p>In addition to these new courses, edX is bringing back several courses from the popular fall 2012 semester: <a href="http://www.edx.org/courses/MITx/6.00x/2013_Spring/about">Introduction to Computer Science and Programming</a>; <a href="http://www.edx.org/courses/MITx/3.091x/2013_Spring/about">Introduction to Solid State Chemistry</a>; <a href="http://www.edx.org/courses/BerkeleyX/CS188.1x/2013_Spring/about">Introduction to Artificial Intelligence</a>; <a href="http://www.edx.org/courses/BerkeleyX/CS169.1x/2013_Spring/info">Software as a Service I</a>;  <a href="http://www.edx.org/courses/BerkeleyX/CS169.2x/2013_Spring/info">Software as a Service II</a>; <a href="http://www.edx.org/courses/BerkeleyX/CS184.1x/2013_Spring/about">Foundations of Computer Graphics</a>.</p>
+      <p>In addition to these new courses, edX is bringing back several courses from the popular fall 2012 semester: <a href="http://www.edx.org/courses/MITx/6.00x/2013_Spring/about">Introduction to Computer Science and Programming</a>; <a href="http://www.edx.org/courses/MITx/3.091x/2013_Spring/about">Introduction to Solid State Chemistry</a>; <a href="http://www.edx.org/courses/BerkeleyX/CS188.1x/2013_Spring/about">Introduction to Artificial Intelligence</a>; <a href="http://www.edx.org/courses/BerkeleyX/CS169.1x/2013_Spring/about">Software as a Service I</a>;  <a href="http://www.edx.org/courses/BerkeleyX/CS169.2x/2013_Spring/about">Software as a Service II</a>; <a href="http://www.edx.org/courses/BerkeleyX/CS184.1x/2013_Spring/about">Foundations of Computer Graphics</a>.</p>
 
       <p>This spring also features Harvard's <em>Copyright</em>, taught by Harvard Law School professor William Fisher III, former law clerk to Justice Thurgood Marshall and expert on the hotly debated U.S. copyright system, which will explore the current law of copyright and the ongoing debates concerning how that law should be reformed. <em>Copyright</em> will be offered as an experimental course, taking advantage of different combinations and uses of teaching materials, educational technologies, and the edX platform. 500 learners will be selected through an open application process that begins in late January 2013.</p>