Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into…

Merge branch 'feature/cale/cms-master' of github.com:MITx/mitx into feature/ichuang/cms-input-filter-latex2edx

common/lib/xmodule/xmodule/templates/html/announcement.yaml

@@ -9,7 +9,7 @@ data: |
       <section class='update-description'>
       	       <section class='primary'>
       	       		<p> Words of encouragement! This is a short note that most students will read. </p>
-      	       		<p class='author'>&mdash; Anant  Agarwal (6.002x Principle Instructor)</p>
+      	       		<p class='author'>Anant  Agarwal (6.002x Principle Instructor)</p>
       	       </section>		  
       	       <p><h3>Primary versus Secondary Updates:</h3> Unfortunately, the internet throws a lot of text at students, and they 
       	       do not read everything that they are given. However, many students <em>do</em> read all that they are

common/lib/xmodule/xmodule/templates/problem/circuitschematic.yaml

@@ -7,7 +7,6 @@ data: |
     <problem>
       <startouttext />
       Your goal for this lab is to design a circuit that implements a
-      <!-- \overline doesn't seem to render correctly -->
       3-input logic gate that implements \(Z = \lnot{(C(A+B))}\) where the
       \(\lnot\) symbol stands for logical negation. This function is
       enumerated in the following truth table: