Merge branch 'master' into feature/abarrett/lms-notes-app

cms/static/js/models/course_relative.js

@@ -25,7 +25,7 @@ CMS.Models.Location = Backbone.Model.extend({
 				course: payload[2],
 				category: payload[3],
 				name: payload[4]
-			}
+			};
 		}
 		else if (_.isString(payload)) {
 			this._tagPattern.lastIndex = 0; // odd regex behavior requires this to be reset sometimes

cms/static/js/models/module_info.js

@@ -6,5 +6,5 @@ CMS.Models.ModuleInfo = Backbone.Model.extend({
     "data": null,
     "metadata" : null,
     "children" : null
-  },
+  }
 });