Merge branch 'mcq-tip-popup' into answer-min-characters

mentoring/public/js/questionnaire.js

 // TODO: Split in two files
-var mrqAttemptsTemplate = _.template($('#xblock-mrq-attempts').html());
-
 function MessageView(element) {
   return {
     messageDOM: $('.choice-message', element),
@@ -93,6 +91,7 @@ function MCQBlock(runtime, element) {
 }
 
 function MRQBlock(runtime, element) {
+    var mrqAttemptsTemplate = _.template($('#xblock-mrq-attempts').html());
     return {
         renderAttempts: function() {
           var data = $('.mrq-attempts', element).data();