make edit link use static_asset_path in xmodule_modifiers.py
Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path

Conflicts:
	common/djangoapps/xmodule_modifiers.py
lms namespace removed
module -> block in common/djangoapps/xmodule_modifiers.py
Merge branch 'master' of github.com:edx/edx-platform into bugfix/ichuang/make-edit-link-use-static-asset-path
LMS: add CSRF token to register form
Add Neurolit to AUTHORS file
Set empty aws credentials to None.
Changed create_enrollment to create_or_update_enrollment
all CourseEnrollment modifications route through create_or_update
purchased_callback now uses the change_mode method
Response to CR
response to CR
sending template pdf with certificate request
fixing some typos
Teach OEE to consider old task_states when trying to recover from an xml mismatch
Centralize to a single GradingServiceError, so that it's caught when expected
Small fix
Assign a score of 0 to tasks with no attempts
Use correct set of OpenEndedChild states