UPDATE: quiz API
UPDATE: quiz to affanBranch
Merge branch 'master' of https://github.com/affanhmalik/novella

Conflicts:
	branch/affanBranch/novella/course/models.pyc
	branch/affanBranch/novella/lms/api.pyc
	branch/affanBranch/novella/lms/models.pyc