Merge branch 'master' into feature_course_add_with_dept

Conflicts:
	reqs/common.txt

diff --cc karmaworld/assets/css/global.css
Simple merge

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

diff --cc karmaworld/urls.py
index 4934731fb4447411f727150e19d05878653e365a,00a83a2585aeb93a479a6c685dfc174b37ed1ff4..895d9ec05253a5ea27eb9bcaa2f54877e270ad0c
--- 1/karmaworld/urls.py
--- 2/karmaworld/urls.py
+++ b/karmaworld/urls.py
@@@ -18,11 -19,13 +18,13 @@@ 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
 -
 +from ajax_select import urls as ajax_select_urls
  
 +# See: https://docs.djangoproject.com/en/dev/ref/contrib/admin/#hooking-adminsite-instances-into-your-urlconf
  admin.autodiscover()
  
  # reused named regex capture groups
@@@ -102,13 -112,17 +108,17 @@@ urlpatterns = patterns(''
      # b: school/course/id/slug
      # c: s../c../slug
      # note file as id, for notes without titles yet
-     url(r'^(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<pk>[\d^/]+)$', \
+     url(r'^note/(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<pk>[\d^/]+)$', \
          NoteView.as_view(), name='note_detail_pk'),
      # note file by note.slug
-     url(r'^' + SLUG.format('school_') + '/' + SLUG.format('course_') +'/'+ SLUG.format('') +'$',
+     url(r'^note/' + SLUG.format('school_') + '/' + SLUG.format('course_') +'/'+ SLUG.format('') +'$',
          NoteView.as_view(), name='note_detail'),
-     #url(r'^(?P<school_slug>[^/]+)/(?P<course_slug>[^/]+)/(?P<slug>[^/]+)$', \
-     #    NoteView.as_view(), name='note_detail'),
+ 
+     # Quizzes
+     url(r'^quiz/(?P<pk>[\d]+)/$',
+         QuizView.as_view(), name='quiz'),
+     url(r'^keywords/' + SLUG.format('') + '/$',
+         KeywordEditView.as_view(), name='keyword_edit'),
  
 -    url(r'^$', CourseListView.as_view(model=Course), name='home'),
 +    url(r'^$', CourseListView.as_view(), name='home'),
  )

diff --cc reqs/common.txt
index b89f403f323cacc48b901b958d36a0000aca7266,d2465734e7b56c987bc592802e3674a83d8f1623..f6059aefaf1dbf8e5a15ca7508996ecf47de67f7
--- 1/reqs/common.txt
--- 2/reqs/common.txt
+++ b/reqs/common.txt
@@@ -22,6 -22,5 +22,8 @@@ django-allaut
  boto==2.6.0
  django-storages==1.1.4
  django-reversion
 +django-ajax-selects
 +git+https://github.com/btbonval/django-ajax-selects-cascade.git
 +psycopg2
+ git+https://github.com/Soaa-/django-nested-inlines.git
+ pyth