Merge branch 'master' of https://github.com/affanhmalik/novella

Conflicts:
	branch/affanBranch/novella/lms/admin.pyc
	branch/affanBranch/novella/lms/models.pyc
	branch/affanBranch/novella/novella/urls.pyc
	novella/corsheaders/__init__.pyc
	novella/corsheaders/defaults.pyc
	novella/corsheaders/middleware.pyc
	novella/corsheaders/models.pyc
	novella/lms/__init__.pyc
	novella/lms/admin.pyc
	novella/lms/api.pyc
	novella/lms/models.pyc
	novella/lms/urls.pyc
	novella/novella/__init__.pyc
	novella/novella/settings.pyc
	novella/novella/urls.pyc
	novella/novella/wsgi.pyc
	novella/tastypie/__init__.pyc
	novella/tastypie/admin.pyc
	novella/tastypie/authentication.pyc
	novella/tastypie/authorization.pyc
	novella/tastypie/bundle.pyc
	novella/tastypie/cache.pyc
	novella/tastypie/compat.pyc
	novella/tastypie/constants.pyc
	novella/tastypie/exceptions.pyc
	novella/tastypie/fields.pyc
	novella/tastypie/http.pyc
	novella/tastypie/models.pyc
	novella/tastypie/resources.pyc
	novella/tastypie/utils/__init__.pyc
	novella/tastypie/utils/dict.pyc
	novella/tastypie/utils/formatting.pyc
	novella/tastypie/utils/timezone.pyc
	novella/tastypie/utils/urls.pyc
	novella/tastypie/utils/validate_jsonp.pyc
Merge branch 'master' of https://github.com/affanhmalik/novella

Conflicts:
	branch/affanBranch/novella/lms/admin.pyc
	branch/affanBranch/novella/lms/models.pyc
	branch/affanBranch/novella/novella/urls.pyc
	novella/corsheaders/__init__.pyc
	novella/corsheaders/defaults.pyc
	novella/corsheaders/middleware.pyc
	novella/corsheaders/models.pyc
	novella/lms/__init__.pyc
	novella/lms/admin.pyc
	novella/lms/api.pyc
	novella/lms/models.pyc
	novella/lms/urls.pyc
	novella/novella/__init__.pyc
	novella/novella/settings.pyc
	novella/novella/urls.pyc
	novella/novella/wsgi.pyc
	novella/tastypie/__init__.pyc
	novella/tastypie/admin.pyc
	novella/tastypie/authentication.pyc
	novella/tastypie/authorization.pyc
	novella/tastypie/bundle.pyc
	novella/tastypie/cache.pyc
	novella/tastypie/compat.pyc
	novella/tastypie/constants.pyc
	novella/tastypie/exceptions.pyc
	novella/tastypie/fields.pyc
	novella/tastypie/http.pyc
	novella/tastypie/models.pyc
	novella/tastypie/resources.pyc
	novella/tastypie/utils/__init__.pyc
	novella/tastypie/utils/dict.pyc
	novella/tastypie/utils/formatting.pyc
	novella/tastypie/utils/timezone.pyc
	novella/tastypie/utils/urls.pyc
	novella/tastypie/utils/validate_jsonp.pyc