complete merge

Author: George

templates/cohorts/export-manifest-modal.html

@@ -61,7 +61,7 @@ <h4 class="modal-title" id="exportManifestModal">Export Cohort Manifest</h4>
                             <li class="checkbox"><label>
                                 <input class="field-checkbox" type="checkbox" value="total_records" checked>
                                 <span class="value">Total Records</span>
-                            </label></li>0
+                            </label></li>
                         </div>
                         <br>