Merge branch 'master' into quizzes

Conflicts:
	karmaworld/urls.py

diff --cc karmaworld/settings/common.py
Simple merge

diff --cc karmaworld/templates/notes/note_detail.html
Simple merge

diff --cc karmaworld/urls.py
index 769f3f93ff0bd92482f0a1fc9cdd82cb90fd081d,6777de84baabba9a4a169642210b7da88d348119..56f6ed2c95b5fe0069db2e8faf57ec8a0e2ac27e
--- 1/karmaworld/urls.py
--- 2/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@@ -17,10 -17,8 +17,9 @@@ from karmaworld.apps.courses.views impo
  from karmaworld.apps.courses.views import school_course_instructor_list
  from karmaworld.apps.notes.views import NoteView, thank_note, NoteSearchView, flag_note, downloaded_note, edit_note_tags
  from karmaworld.apps.notes.views import RawNoteDetailView
- from karmaworld.apps.notes.views import PDFView
  from karmaworld.apps.moderation import moderator
  from karmaworld.apps.document_upload.views import save_fp_upload
 +from karmaworld.apps.quizzes.views import QuizView, KeywordEditView
  from karmaworld.apps.users.views import ProfileView
  
  # See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf