diff --git a/.gitignore b/.gitignore
index 2fd1ca0181..493df5a7fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,4 +27,5 @@ lms/lib/comment_client/python
 nosetests.xml
 cover_html/
 .idea/
+.redcar/
 chromedriver.log
\ No newline at end of file
diff --git a/.redcar/lucene/_no.cfs.REMOVED.git-id b/.redcar/lucene/_no.cfs.REMOVED.git-id
deleted file mode 100644
index 3c89e18842..0000000000
--- a/.redcar/lucene/_no.cfs.REMOVED.git-id
+++ /dev/null
@@ -1 +0,0 @@
-c9f553d4f7af7f08ff349f64af015dd592ecc633
\ No newline at end of file
diff --git a/.redcar/lucene/segments.gen b/.redcar/lucene/segments.gen
index 2306e1f9d3..88b134d0a8 100644
Binary files a/.redcar/lucene/segments.gen and b/.redcar/lucene/segments.gen differ
diff --git a/.redcar/lucene_last_updated b/.redcar/lucene_last_updated
index c3c66e1879..9916653dfb 100644
--- a/.redcar/lucene_last_updated
+++ b/.redcar/lucene_last_updated
@@ -1 +1 @@
-1360352491
+1360356040
diff --git a/.redcar/storage/cursor_saver.yaml b/.redcar/storage/cursor_saver.yaml
index 17e0e4f4f3..29f44e99c7 100644
--- a/.redcar/storage/cursor_saver.yaml
+++ b/.redcar/storage/cursor_saver.yaml
@@ -207,4 +207,7 @@ cursor_positions:
   - :path: common/static/coffee/src/discussion/views/discussion_thread_view_inline.coffee
     :cursor_offset: 1244
     :timestamp: 2013-02-06 17:12:07 -05:00
+  - :path: .gitignore
+    :cursor_offset: 330
+    :timestamp: 2013-02-08 15:08:21 -05:00
 files_to_retain: 0
diff --git a/.redcar/tags b/.redcar/tags
index 29398164fb..c2cbbed7d3 100644
--- a/.redcar/tags
+++ b/.redcar/tags
@@ -1,5 +1,9 @@
-1360352491
+1360356040
 Ammeter	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Ammeter(x,y,rotation,color,offset)
+B	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function B()
+B	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function B(){var b=false;try{var c=m.location.search;return (c.indexOf(U)!=-1||(c.indexOf(V)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(W)==-1}catch(a){}B=function()
+C	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function C()
+C	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function C(){if(q&&r){var b=n.getElementById(Q);var c=b.contentWindow;if(B()){c.__gwt_getProperty=function(a){return H(a)}}protex=null;c.gwtOnLoad(z,Q,t,y);o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:X,millis:(new Date).getTime(),type:Y})
 Capacitor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Capacitor(n1,n2,v)
 Capacitor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Capacitor(x,y,rotation,name,c)
 Circuit	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Circuit()
@@ -10,6 +14,8 @@ Component	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f56286
 Conditional	/home/kevin/mitx_all/mitx/lms/static/coffee/module/0-cebb304c95779c66d533cbf301f43402.js	function Conditional(element)
 ConnectionPoint	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function ConnectionPoint(parent,x,y)
 Courseware	/home/kevin/mitx_all/mitx/lms/static/coffee/src/courseware.js	function Courseware()
+D	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function D()
+D	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function D(){function e(a){var b=a.lastIndexOf(Z);if(b==-1){b=a.length}var c=a.indexOf($);if(c==-1){c=a.length}var d=a.lastIndexOf(_,Math.min(c,b));return d>=0?a.substring(0,d+1)
 Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/3-cbb943b7f9c6d0b1b331e9e2f727e179.js	function Descriptor(element)
 Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/12-cbb943b7f9c6d0b1b331e9e2f727e179.js	function Descriptor(element)
 Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/4-cbb943b7f9c6d0b1b331e9e2f727e179.js	function Descriptor(element)
@@ -23,17 +29,38 @@ Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/0-cbb943b7f9c6d0b1
 Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/8-cbb943b7f9c6d0b1b331e9e2f727e179.js	function Descriptor(element)
 Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-cbb943b7f9c6d0b1b331e9e2f727e179.js	function Descriptor(element)
 Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-cbb943b7f9c6d0b1b331e9e2f727e179.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/11-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/4-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/0-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/9-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/5-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/7-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/12-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/10-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/3-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/2-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
+Descriptor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/8-1367733fd808ae2ce154fb10b7531a05.js	function Descriptor(element)
 Device	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Device()
 Diode	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Diode(n1,n2,v,type)
 Diode	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Diode(x,y,rotation,name,area,type)
 DiscussionModuleView	/home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/discussion_module_view.js	function DiscussionModuleView()
 DiscussionThreadListView	/home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/views/discussion_thread_list_view.js	function DiscussionThreadListView()
+E	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function E()
+E	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function E(){var b=document.getElementsByTagName(mb);for(var c=0,d=b.length;c<d;++c){var e=b[c],f=e.getAttribute(nb),g;if(f){f=f.replace(ob,P);if(f.indexOf(pb)>=0){continue}if(f==qb){g=e.getAttribute(rb);if(g){var h,i=g.indexOf(sb);if(i>=0){f=g.substring(0,i);h=g.substring(i+1)}else{f=g;h=P}u[f]=h}}else if(f==tb){g=e.getAttribute(rb);if(g){try{A=eval(g)}catch(a){alert(ub+g+vb)}}}else if(f==wb){g=e.getAttribute(rb);if(g){try{z=eval(g)}catch(a){alert(ub+g+xb)
 ElOutput	/home/kevin/mitx_all/mitx/lms/static/coffee/module/7-40fec654f1c6f76f154392f82caf37df.js	function ElOutput(config, state)
+F	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function F(a)
+F	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function F(a)
 Fet	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Fet(d,g,s,ratio,name,type)
+G	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function G(a, b)
+G	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function G(a,b){var c=x;for(var d=0,e=a.length-1;d<e;++d){c=c[a[d]]||(c[a[d]]=[])
 GLabelElOutput	/home/kevin/mitx_all/mitx/lms/static/coffee/module/8-4a19a2b354fe97d9386a88a5ad36fef4.js	function GLabelElOutput(config, state)
 Graph	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function Graph(gstId, config, state)
 Ground	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Ground(x,y,rotation)
 GstMain	/home/kevin/mitx_all/mitx/lms/static/coffee/module/0-8359c8840276bc9275c7da508e57ff39.js	function GstMain(gstId)
+H	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function H(a)
+H	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function H(a){var b=w[a](),c=v[a];if(b in c){return b}var d=[];for(var e in c){d[c[e]]=e}if(A){A(a,d,b)
 HTMLModule	/home/kevin/mitx_all/mitx/lms/static/coffee/module/2-80a3e7a7cbbdf47978d6c83938f0705a.js	function HTMLModule(element)
 Histogram	/home/kevin/mitx_all/mitx/lms/static/coffee/src/histogram.js	function Histogram(id, rawData)
 ISource	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function ISource(npos,nneg,v)
@@ -42,12 +69,16 @@ Inductor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f562867
 Inductor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Inductor(x,y,rotation,name,l)
 InlineDiscussion	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-e54b5c7f7b657100c24d82263144a4fd.js	function InlineDiscussion(element)
 Inputs	/home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2580d7c13fbc0d0e8506635308a49343.js	function Inputs(gstId, gstClass, state)
+J	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function J()
+J	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function J(){if(!I){I=true;var a=n.createElement(yb);a.src=zb;a.id=Q;a.style.cssText=Ab;a.tabIndex=-1;n.body.appendChild(a);o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:X,millis:(new Date).getTime(),type:Bb});a.contentWindow.location.replace(t+L)
 JavascriptLoader	/home/kevin/mitx_all/mitx/lms/static/coffee/module/2-53c44c016974a4e7b767192c8fa16fe0.js	function JavascriptLoader()
 JavascriptLoader	/home/kevin/mitx_all/mitx/lms/static/coffee/module/3-53c44c016974a4e7b767192c8fa16fe0.js	function JavascriptLoader()
 JavascriptLoader	/home/kevin/mitx_all/mitx/lms/static/coffee/module/0-53c44c016974a4e7b767192c8fa16fe0.js	function JavascriptLoader()
 Label	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Label(x,y,rotation,label)
 NFet	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function NFet(x,y,rotation,name,w_over_l)
 Navigation	/home/kevin/mitx_all/mitx/lms/static/coffee/src/navigation.js	function Navigation()
+O	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function O()
+O	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function O(){if(!s){s=true;if(!__gwt_stylesLoaded[Yb]){var a=n.createElement(Zb);__gwt_stylesLoaded[Yb]=a;a.setAttribute($b,_b);a.setAttribute(ac,t+Yb);n.getElementsByTagName(bc)[0].appendChild(a)}C();if(n.removeEventListener){n.removeEventListener(cc,O,false)}if(N){clearInterval(N)
 OpAmp	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function OpAmp(x,y,rotation,name,A)
 Opamp	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Opamp(np,nn,no,ng,branch,A,name)
 PFet	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function PFet(x,y,rotation,name,w_over_l)
@@ -57,6 +88,7 @@ PeerGradingProblem	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-e33472a4
 PeerGradingProblemBackend	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-e33472a4db6b1b57dc05359769e90389.js	function PeerGradingProblemBackend(ajax_url, mock_backend)
 Probe	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Probe(x,y,rotation,color,offset)
 Problem	/home/kevin/mitx_all/mitx/lms/static/coffee/module/0-0945eaf7b5bd2991b12a9eb202df6684.js	function Problem(element)
+Problem	/home/kevin/mitx_all/mitx/lms/static/coffee/module/0-11588b4a149bbd4a61cc7c685d714bcc.js	function Problem(element)
 Resistor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Resistor(n1,n2,v)
 Resistor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function Resistor(x,y,rotation,name,r)
 Rubric	/home/kevin/mitx_all/mitx/lms/static/coffee/module/0-2727c3cbfe53fab7a278dfa4d96109da.js	function Rubric()
@@ -97,11 +129,16 @@ checkForTicksNames	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f
 checkForTicksNames	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function checkForTicksNames(axisName)
 collinear	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function collinear(p1,p2,p3)
 component_slider	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function component_slider(event,ui)
+computePropValue	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function computePropValue(propName)
+computeScriptBase	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function computeScriptBase()
+configureApplet	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function configureApplet(element, applet)
 createFunctions	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function createFunctions()
 createInput	/home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2580d7c13fbc0d0e8506635308a49343.js	function createInput(inputDiv, paramName)
 createMarkingsFunctions	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function createMarkingsFunctions()
 createMovingLabelFunctions	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function createMovingLabelFunctions()
 createSlider	/home/kevin/mitx_all/mitx/lms/static/coffee/module/4-80d80fae81a270e6509a48f20610b708.js	function createSlider(sliderDiv, paramName)
+ctor	/home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/discussion_module_view.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
+ctor	/home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/views/discussion_thread_list_view.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
 ctor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/8-05087a27dfff9d586de0bbf7d8ab712f.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
 ctor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/9-59ee7f1328aa8cbde9f2829e29cf697b.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
 ctor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/4-7d67198c049863d6c664dcbc6ad3bfd2.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
@@ -110,12 +147,19 @@ ctor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2f8f384f2ff10dfe7b3afd
 ctor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/3-ae3a8f704bfe7366649872bb0cee3863.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
 ctor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-7682277e07e67ea91adaf3e720f359a6.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
 ctor	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-e54b5c7f7b657100c24d82263144a4fd.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
-ctor	/home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/discussion_module_view.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
-ctor	/home/kevin/mitx_all/mitx/common/static/coffee/src/discussion/views/discussion_thread_list_view.js	function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor()
 dialog_cancel	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function dialog_cancel(event)
 dialog_check_for_ENTER	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function dialog_check_for_ENTER(event)
 dialog_okay	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function dialog_okay(event)
+e	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function e(a)
+e	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function e(a){var b=a.lastIndexOf(Z);if(b==-1){b=a.length}var c=a.indexOf($);if(c==-1){c=a.length}var d=a.lastIndexOf(_,Math.min(c,b));return d>=0?a.substring(0,d+1)
 engineering_notation	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function engineering_notation(n,nplaces,trim)
+ensureAbsoluteUrl	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function ensureAbsoluteUrl(url)
+f	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function f(a)
+f	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function f(a){if(a.match(/^\w+:\/\//)){}else{var b=n.createElement(ab);b.src=a+bb;a=e(b.src)
+formatError	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function formatError(raw_info)
+formatInfo	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function formatInfo(raw_info)
+g	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function g()
+g	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function g(){var a=F(cb);if(a!=null)
 generateData	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function generateData()
 generateHelperArrays	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js	function generateHelperArrays()
 generateMarkings	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function generateMarkings()
@@ -124,15 +168,34 @@ getAllParameterNames	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612
 getAllParameterValues	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js	function getAllParameterValues()
 getBarAlign	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function getBarAlign()
 getBarWidth	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function getBarWidth()
+getDirectoryOfFile	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function getDirectoryOfFile(path)
 getParamObj	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js	function getParamObj(paramName)
 getParameterValue	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js	function getParameterValue(paramName)
 graph_mouse_move	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function graph_mouse_move(event)
+h	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function h()
+h	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function h(){var a=n.getElementsByTagName(db);for(var b=0;b<a.length;++b){if(a[b].src.indexOf(eb)!=-1){return e(a[b].src)
+i	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function i()
+i	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function i(){var a;if(typeof isBodyLoaded==fb||!isBodyLoaded()){var b=gb;var c;n.write(hb+b+ib);c=n.getElementById(b);a=c&&c.previousSibling;while(a&&a.tagName!=jb){a=a.previousSibling}if(c){c.parentNode.removeChild(c)}if(a&&a.src){return e(a.src)
 image_input_click	/home/kevin/mitx_all/mitx/lms/static/coffee/module/0-4d162d2de1aac3828ff8f47d82e5ed3c.js	function image_input_click(id,event)
+initializeApplet	/home/kevin/mitx_all/mitx/common/static/js/capa/edit-a-gene.js	function initializeApplet(applet)
+initializeApplets	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function initializeApplets()
+initializeProtex	/home/kevin/mitx_all/mitx/common/static/js/capa/design-protein-2d.js	function initializeProtex()
 inputOnChange	/home/kevin/mitx_all/mitx/lms/static/coffee/module/5-2580d7c13fbc0d0e8506635308a49343.js	function inputOnChange(event)
 inside	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function inside(rect,x,y)
 interp_coeffs	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function interp_coeffs(t, t0, t1, t2)
 interpolate	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function interpolate(t,times,values)
 intersect	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function intersect(r1,r2)
+isHostedMode	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function isHostedMode()
+isLocationOk	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function isLocationOk()
+j	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function j()
+j	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function j(){var a=n.getElementsByTagName(kb);if(a.length>0)
+jsme_export	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function jsme_export()
+jsmolcalc	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function jsmolcalc()
+k	/home/kevin/mitx_all/mitx/common/static/js/capa/jsme/jsme_export.nocache.js	function k()
+k	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function k()
+loadAppletData	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function loadAppletData(applet, data, input_field)
+loadGWTScripts	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function loadGWTScripts()
+loadScript	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function loadScript(src)
 load_dc	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function load_dc(ckt,soln,rhs)
 load_tran	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function load_tran(ckt,soln,rhs)
 logme	/home/kevin/mitx_all/mitx/lms/static/coffee/module/2-af111f211312d70325129ec128562a4c.js	function logme()
@@ -144,6 +207,9 @@ mat_scale_add	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5
 mat_solve	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function mat_solve(M,rhs)
 mat_solve_rq	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function mat_solve_rq(M, rhs)
 mat_v_mult	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function mat_v_mult(M,x,b,scale)
+maybeInjectFrame	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function maybeInjectFrame()
+maybeStartModule	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function maybeStartModule()
+onBodyDone	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function onBodyDone()
 onUpdatePlot	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function onUpdatePlot(event)
 ord	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function ord(ch)
 parse_number	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function parse_number(s,default_v)
@@ -163,11 +229,14 @@ processAsymptote	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d
 processFloat	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js	function processFloat(attrName, newAttrName)
 processFuncObj	/home/kevin/mitx_all/mitx/lms/static/coffee/module/8-4a19a2b354fe97d9386a88a5ad36fef4.js	function processFuncObj(obj)
 processFuncObj	/home/kevin/mitx_all/mitx/lms/static/coffee/module/7-40fec654f1c6f76f154392f82caf37df.js	function processFuncObj(obj)
+processMetas	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function processMetas()
 processMovingLabel	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function processMovingLabel(obj)
 processParameter	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-79f612baa84fbd910e40cb230715ccb1.js	function processParameter(obj)
 processTicks	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function processTicks(ticksStr, ticksObj, unitsType)
+protex	/home/kevin/mitx_all/mitx/common/static/js/capa/protex/protex.nocache.js	function protex(){var P='',xb='" for "gwt:onLoadErrorFn"',vb='" for "gwt:onPropertyErrorFn"',ib='"><\/script>',Z='#',Xb='.cache.html',_='/',lb='//',Qb='39CC89519B0E1FCB47B935AC9FE13D7B',Rb='6E05B1CD5BFCAF7D53C7C64D84318178',Wb=':',pb='::',dc='<script defer="defer">protex.onInjectionDone(\'protex\')<\/script>',hb='<script id="',sb='=',$='?',ub='Bad handler "',Sb='C824A958AB642DC2213DFFDAC640BEAA',Tb='D9267DE8FB02F8B995B4A58C66C76E29',cc='DOMContentLoaded',Ub='F275492F7098103BCB05F4F86ABF6218',Vb='F3301B0E65F38C7FCF2EF3764B3BB0B6',jb='SCRIPT',gb='__gwt_marker_protex',kb='base',cb='baseUrl',T='begin',S='bootstrap',bb='clear.cache.gif',rb='content',Y='end',Kb='gecko',Lb='gecko1_8',U='gwt.codesvr=',V='gwt.hosted=',W='gwt.hybrid',wb='gwt:onLoadErrorFn',tb='gwt:onPropertyErrorFn',qb='gwt:property',bc='head',Ob='hosted.html?protex',ac='href',Jb='ie6',Ib='ie8',Hb='ie9',yb='iframe',ab='img',zb="javascript:''",Zb='link',Nb='loadExternalRefs',mb='meta',Bb='moduleRequested',X='moduleStartup',Gb='msie',nb='name',Db='opera',Ab='position:absolute;width:0;height:0;border:none',Q='protex',Yb='protex.css',eb='protex.nocache.js',ob='protex::',$b='rel',Fb='safari',db='script',Pb='selectingPermutation',R='startup',_b='stylesheet',fb='undefined',Mb='unknown',Cb='user.agent',Eb='webkit';var m=window,n=document,o=m.__gwtStatsEvent?function(a){return m.__gwtStatsEvent(a)}:null,p=m.__gwtStatsSessionId?m.__gwtStatsSessionId:null,q,r,s,t=P,u={},v=[],w=[],x=[],y=0,z,A;o&&o({moduleName:Q,sessionId:p,subSystem:R,evtGroup:S,millis:(new Date).getTime(),type:T});if(!m.__gwt_stylesLoaded){m.__gwt_stylesLoaded={}}if(!m.__gwt_scriptsLoaded){m.__gwt_scriptsLoaded={}}function B(){var b=false;try{var c=m.location.search;return (c.indexOf(U)!=-1||(c.indexOf(V)!=-1||m.external&&m.external.gwtOnLoad))&&c.indexOf(W)==-1}catch(a){}B=function()
 pwl_source	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function pwl_source(src,tv_pairs,repeat)
 redraw_plot	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function redraw_plot(graph)
+requestAppletData	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function requestAppletData(element, applet, input_field)
 roundToPrec	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function roundToPrec(num, prec)
 schematic_double_click	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function schematic_double_click(event)
 schematic_key_down	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function schematic_key_down(event)
@@ -188,11 +257,21 @@ tool_click	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628
 tool_enter	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function tool_enter(event)
 tool_leave	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function tool_leave(event)
 trim	/home/kevin/mitx_all/mitx/lms/static/coffee/module/3-6e8bf396002ae78ecc4f7bd88b572323.js	function trim(str)
+tryBaseTag	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function tryBaseTag()
+tryMarkerScript	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function tryMarkerScript()
+tryMetaTag	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function tryMetaTag()
+tryNocacheJsTag	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function tryNocacheJsTag()
+unflattenKeylistIntoAnswers	/home/kevin/mitx_all/mitx/common/static/js/capa/jsmolcalc/jsmolcalc.nocache.js	function unflattenKeylistIntoAnswers(propValArray, value)
+updateInput	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function updateInput(applet, input_field)
+updateMessages	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function updateMessages(message_field, values)
 updateMovingLabels	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function updateMovingLabels()
 updatePlot	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function updatePlot()
 updatePlot	/home/kevin/mitx_all/mitx/lms/static/coffee/module/6-6d4d382f9d37a3a1850461186a374eba.js	function updatePlot()
 update_schematics	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function update_schematics()
 view_limits	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function view_limits(vmin,vmax)
+waitForApplet	/home/kevin/mitx_all/mitx/common/static/js/capa/edit-a-gene.js	function waitForApplet(applet)
+waitForGWT	/home/kevin/mitx_all/mitx/common/static/js/capa/editamolecule.js	function waitForGWT()
+waitForProtex	/home/kevin/mitx_all/mitx/common/static/js/capa/design-protein-2d.js	function waitForProtex()
 window_close	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function window_close(win)
 window_close_button	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function window_close_button(event)
 window_mouse_down	/home/kevin/mitx_all/mitx/lms/static/coffee/module/1-222009e8c24f5628677581995d2488d9.js	function window_mouse_down(event)
diff --git a/lms/templates/discussion/_thread_list_template.html b/lms/templates/discussion/_thread_list_template.html
index 98fdea0045..34038d9909 100644
--- a/lms/templates/discussion/_thread_list_template.html
+++ b/lms/templates/discussion/_thread_list_template.html
@@ -23,9 +23,9 @@
         %if is_course_cohorted and is_moderator:
         <span class="group-filter-label cohort">Show:</span>
             <select class="group-filter-select cohort-options cohort"> 
-                <option value="all">All Groups</option>
+                <option value="all">View All</option>
                     %for c in cohorts:
-                        <option value="${c.id}">${c.name} and public</option>
+                        <option value="${c.id}">View as ${c.name}</option>
                     %endfor
             </select>        
         %endif