Merge branch 'release'

Conflicts:
	requirements/edx/base.txt

lms/templates/notes.html

@@ -169,6 +169,7 @@
         },
     };
 	
+	tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
 	var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
 	
 	//remove old instances

lms/templates/static_htmlbook.html

@@ -13,6 +13,7 @@
 
 <%block name="js_extra">
   <script type="text/javascript">
+	tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
 (function($) {
     $.fn.myHTMLViewer = function(options) {
         var urlToLoad = null;

lms/templates/textannotation.html

@@ -162,8 +162,9 @@
         },
     };
 	
-	var imgURLRoot = window.location.protocol;
-    imgURLRoot +="//" + uri.replace(imgURLRoot+"//","").split('/')[0] + "/static/js/vendor/ova/catch/img/";
+
+	var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
+	tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
 	
 	//remove old instances
     if (Annotator._instances.length !== 0) {

lms/templates/videoannotation.html

@@ -163,9 +163,8 @@
         },
     };
 	
-	var imgURLRoot = window.location.protocol;
-    imgURLRoot +="//" + uri.replace(imgURLRoot+"//","").split('/')[0] + "/static/js/vendor/ova/catch/img/";
-
+	var imgURLRoot = "${settings.STATIC_URL}" + "js/vendor/ova/catch/img/";
+	tinyMCE.baseURL = "${settings.STATIC_URL}" + "js/vendor/ova";
 	
 	//remove old instances
     if (Annotator._instances.length !== 0) {