Merge branch 'master' into quizzes

diff --cc karmaworld/apps/notes/models.py
Simple merge

diff --cc karmaworld/templates/notes/note_detail.html
index 7b1cabee9147a314fb727bc5488276c3767cad46,f24dd5a2ad1d65e44ca51023932751ab2e8257a1..5a90f6f0e1d844286f86101a925f9b4e9a606405
--- 1/karmaworld/templates/notes/note_detail.html
--- 2/karmaworld/templates/notes/note_detail.html
+++ b/karmaworld/templates/notes/note_detail.html
@@@ -20,11 -24,9 +20,12 @@@
      var csrf_token = "{{ csrf_token }}";
    </script>
    <script src="{{ STATIC_URL }}js/setup-ajax.js"></script>
 +{% endblock %}
 +
 +{% block bodyscripts %}
    <script src="{{ STATIC_URL }}js/note-detail.js" ></script>
    <script src="{{ STATIC_URL }}js/pxem.jQuery.js"></script>
+   <script src="{{ STATIC_URL }}js/marked.js" ></script>
  {% endblock %}
  
  {% block content %}

diff --cc karmaworld/urls.py
index 6f2046b2d4ec577e586911a8585c5bde251e8dfc,3697277b09f4f994700bc548076b7af451dfb455..677e4a78e58ca261c0fe398d087a450d4d22f198
--- 1/karmaworld/urls.py
--- 2/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@@ -19,8 -19,8 +19,9 @@@ from karmaworld.apps.notes.views impor
  from karmaworld.apps.notes.views import RawNoteDetailView
  from karmaworld.apps.moderation import moderator
  from karmaworld.apps.document_upload.views import save_fp_upload
 +from karmaworld.apps.quizzes.views import QuizView, KeywordEditView, quiz_answer
  from karmaworld.apps.users.views import ProfileView
+ from karmaworld.apps.users.views import ControlView
  
  # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf
  

diff --cc reqs/common.txt
Simple merge