UPDATED: some api files
Merge branch 'master' of https://github.com/affanhmalik/novella

Conflicts:
	branch/affanBranch/novella/lms/urls.pyc
	branch/affanBranch/novella/quiz/api.pyc